diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:54 -0700 |
| commit | 7c96471947c680d884e0ec7ea4f1087d14496f55 (patch) | |
| tree | 1d6120feebea4c92e4d64cf3c83c364fdc33331c /builtin | |
| parent | 69307312d1bee69d33151cee8ed5940c46d7ee39 (diff) | |
| parent | 779b88a91fb9719683bed78c81ef6ace1cedd7da (diff) | |
| download | git-7c96471947c680d884e0ec7ea4f1087d14496f55.tar.gz git-7c96471947c680d884e0ec7ea4f1087d14496f55.tar.xz | |
Merge branch 'sb/checkout-explit-detach-no-advice' into maint
"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 c3486bdec..91bafdaef 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -655,7 +655,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); } |