зеркало из https://github.com/microsoft/git.git
branch: improve advice when --recurse-submodules fails
'git branch --recurse-submodules start from-here' fails if any submodule present in 'from-here' is not yet cloned (under submodule.propagateBranches=true). We then give this advice: "You may try updating the submodules using 'git checkout from-here && git submodule update --init'" If 'submodule.recurse' is set, 'git checkout from-here' will also fail since it will try to recursively checkout the submodules. Improve the advice by adding '--no-recurse-submodules' to the checkout command. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Reviewed-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a7caae2729
Коммит
97cf0c7de5
2
branch.c
2
branch.c
|
@ -756,7 +756,7 @@ void create_branches_recursively(struct repository *r, const char *name,
|
|||
_("submodule '%s': unable to find submodule"),
|
||||
submodule_entry_list.entries[i].submodule->name);
|
||||
if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
|
||||
advise(_("You may try updating the submodules using 'git checkout %s && git submodule update --init'"),
|
||||
advise(_("You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'"),
|
||||
start_commitish);
|
||||
exit(code);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче