Skip to content

Commit 97cf0c7

Browse files
phil-blaingitster
authored andcommitted
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 <[email protected]> Reviewed-by: Glen Choo <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a7caae2 commit 97cf0c7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

branch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ void create_branches_recursively(struct repository *r, const char *name,
756756
_("submodule '%s': unable to find submodule"),
757757
submodule_entry_list.entries[i].submodule->name);
758758
if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
759-
advise(_("You may try updating the submodules using 'git checkout %s && git submodule update --init'"),
759+
advise(_("You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'"),
760760
start_commitish);
761761
exit(code);
762762
}

0 commit comments

Comments
 (0)