[PATCH] checkout: do not mention detach advice for explicit --detach option
- From
Stefan Beller <sbeller@google.com>
- Date
- Aug 10, 2016, 17:28 UTC
- Message-ID
- <20160810172800.23575-1-sbeller@google.com>
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> --- builtin/checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index 27c1a05..fa2dce5 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -655,7 +655,7 @@ 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); }
-- 2.9.2.665.gdb8bb2f