diff options
| author |  Stefan Beller <sbeller@google.com> | 2016-08-15 11:40:21 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-08-15 15:01:45 -0700 |
| commit | 779b88a91fb9719683bed78c81ef6ace1cedd7da (patch) | |
| tree | a17291d251b0c6b912a93e76ec2ab6083f24dbb0 /builtin/checkout.c | |
| parent | Git 2.9.3 (diff) | |
| download | tgif-779b88a91fb9719683bed78c81ef6ace1cedd7da.tar.xz | |
checkout: do not mention detach advice for explicit --detach option
When a user asked for a detached HEAD specifically with `--detach`,
we do not need to give advice on what a detached HEAD state entails as
we can assume they know what they're getting into as they asked for it.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -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 c3486bdec3..91bafdaef4 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); } |