From cfbda6ba6b33e903df58f96fdb2ee9314097ff2f Mon Sep 17 00:00:00 2001 From: Glen Choo Date: Tue, 29 Mar 2022 20:01:17 +0000 Subject: branch: give submodule updating advice before exit Fix a bug where "hint:" was printed _before_ "fatal:" (instead of the other way around). Signed-off-by: Glen Choo Signed-off-by: Junio C Hamano --- branch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'branch.c') diff --git a/branch.c b/branch.c index 608db0fc91..50459c432c 100644 --- a/branch.c +++ b/branch.c @@ -602,11 +602,13 @@ void create_branches_recursively(struct repository *r, const char *name, */ for (i = 0; i < submodule_entry_list.entry_nr; i++) { if (submodule_entry_list.entries[i].repo == NULL) { + int code = die_message( + _("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'"), start_commitish); - die(_("submodule '%s': unable to find submodule"), - submodule_entry_list.entries[i].submodule->name); + exit(code); } if (submodule_create_branch( -- cgit v1.2.3