From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
git@vger.kernel.org, jrnieder@gmail.com,
remi.galan-alfonso@ensimag.grenoble-inp.fr
Subject: Re: [PATCH 2/2] checkout: do not mention detach advice for explicit --detach option
Date: Mon, 15 Aug 2016 17:13:54 -0400 [thread overview]
Message-ID: <20160815211354.vsyg3lpira6pttom@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqd1l9g2lv.fsf@gitster.mtv.corp.google.com>
On Mon, Aug 15, 2016 at 02:10:36PM -0700, Junio C Hamano wrote:
> > Guilty as charged. I do agree that this is over-engineered.
>
> Let's discard 1/2 and amend 2/2 with this incremental.
Looks good (though I really am OK the other way if people feel
strongly).
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 2a32b5f..337c35a 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -656,8 +656,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
> REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
> if (!opts->quiet) {
> if (old->path &&
> - (advice_detached_head == 1 ||
> - (advice_detached_head == -1 && !opts->force_detach)))
> + advice_detached_head == 1 && !opts->force_detach)
Maybe s/== 1//?
That's more idiomatic, though maybe you were future-proofing in case we
turn it into a tri-state later. :)
-Peff
next prev parent reply other threads:[~2016-08-15 21:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 18:40 [PATCH 1/2] advice: preset advice preferences to -1 Stefan Beller
2016-08-15 18:40 ` [PATCH 2/2] checkout: do not mention detach advice for explicit --detach option Stefan Beller
2016-08-15 18:47 ` Jeff King
2016-08-15 18:54 ` Stefan Beller
2016-08-15 19:08 ` Jeff King
2016-08-15 21:05 ` Junio C Hamano
2016-08-15 21:10 ` Junio C Hamano
2016-08-15 21:13 ` Jeff King [this message]
2016-08-15 22:38 ` Junio C Hamano
2016-08-15 21:17 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160815211354.vsyg3lpira6pttom@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).