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>

diff --git a/branch.c b/branch.c
index 8ee9f43539f3e1c53f8c233f5efd46663652b6db..b673143cbe3f419a76990d5754aaa03be0eb2108 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -383,13 +383,10 @@ static void dwim_branch_start(struct repository *r, const char *start_name,
        real_ref = NULL;
        if (get_oid_mb(start_name, &oid)) {
                if (explicit_tracking) {
-                       if (advice_enabled(ADVICE_SET_UPSTREAM_FAILURE)) {
-                               int code = die_message(_(upstream_missing),
-                                                      start_name);
-                               advise(_(upstream_advice));
-                               exit(code);
-                       }
-                       die(_(upstream_missing), start_name);
+                       int code = die_message(_(upstream_missing), start_name);
+                       advise_if_enabled(ADVICE_SET_UPSTREAM_FAILURE,
+                                         _(upstream_advice));
+                       exit(code);
                }
                die(_("Not a valid object name: '%s'."), start_name);
        }