branch.c: simplify advice-and-die sequence
In the dwim_branch_start(), when we cannot find an appropriate upstream, we will die with the same message anyway, whether we issue an advice message. Flip the code around a bit and simplify the flow using advise_if_enabled() function. Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Glen Choo committed
Mar 31, 2022 at 15:41 UTC
6696601241d27cf7b2834b92788a73a6f4af2e89
1 file changed
+4
-7
branch.c
+4
-7
@@ -383,13 +383,10 @@ static void dwim_branch_start(struct repository *r, const char *start_name,
383
real_ref = NULL;
384
if (get_oid_mb(start_name, &oid)) {
385
if (explicit_tracking) {
386
- if (advice_enabled(ADVICE_SET_UPSTREAM_FAILURE)) {
387
- int code = die_message(_(upstream_missing),
388
- start_name);
389
- advise(_(upstream_advice));
390
- exit(code);
391
- }
392
- die(_(upstream_missing), start_name);
386
+ int code = die_message(_(upstream_missing), start_name);
387
+ advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
388
+ _(upstream_advice));
389
+ exit(code);
390
}
391
die(_("Not a valid object name: '%s'."), start_name);
392
}