Re: [PATCH] checkout: do not mention detach advice for explicit --detach option

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 10, 2016, 18:00 UTC
Message-ID: <xmqqd1lg5wsq.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160810172800.23575-1-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

> 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.

Makes sense; I agree that "Don't be noisy if you did exactly what you were told to do." is a very sensible principle.

Show 18 quoted lines

> 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);
>  		}