diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2023-01-16 18:41:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-19 00:13:21 +0100 |
| commit | 97cf0c7de5dd49d9b518ebe694036159f6515422 (patch) | |
| tree | a31e74bf1e2acadbf9b852d810a2174351da1a27 /branch.c | |
| parent | Sync with 'maint' (diff) | |
| download | git-97cf0c7de5dd49d9b518ebe694036159f6515422.tar.xz git-97cf0c7de5dd49d9b518ebe694036159f6515422.zip | |
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>
Diffstat (limited to 'branch.c')
| -rw-r--r-- | branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); } |