diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:15 -0700 |
| commit | e6dab9f62fbda86d0adb530f0c2a543e3e2ed118 (patch) | |
| tree | 12179049c1db721b1aa60404b3e8d75bdd5e266e /builtin | |
| parent | Merge branch 'tb/t0027-raciness-fix' (diff) | |
| parent | checkout: do not mention detach advice for explicit --detach option (diff) | |
| download | tgif-e6dab9f62fbda86d0adb530f0c2a543e3e2ed118.tar.xz | |
Merge branch 'sb/checkout-explit-detach-no-advice'
"git checkout --detach <branch>" used to give the same advice
message as that is issued when "git checkout <tag>" (or anything
that is not a branch name) is given, but asking with "--detach" is
an explicit enough sign that the user knows what is going on. The
advice message has been squelched in this case.
* sb/checkout-explit-detach-no-advice:
checkout: do not mention detach advice for explicit --detach option
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 4866111522..8672d0724f 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -658,7 +658,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts, update_ref(msg.buf, "HEAD", new->commit->object.oid.hash, NULL, REF_NODEREF, UPDATE_REFS_DIE_ON_ERR); if (!opts->quiet) { - if (old->path && advice_detached_head) + if (old->path && + advice_detached_head && !opts->force_detach) detach_advice(new->name); describe_detached_head(_("HEAD is now at"), new->commit); } |