From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2011 22:02:37 GMT
Subject: Re: [PATCH 4/6] notes: refactor display notes default handling
Message-ID: <7vfwq5poua.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110329205727.GD23466@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> This is in preparation for more notes-related revision
> command-line options.
>
> The "suppress_default_notes" option is renamed to
> "use_default_notes", and is now a tri-state with values less
> than one indicating "not set".  If the value is "not set",
> then we show default refs if and only if no other refs were
> given.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ...
> diff --git a/revision.c b/revision.c
> index 24b89eb..315a7f4 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -1368,10 +1370,13 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
>  	} else if (!strcmp(arg, "--show-notes")) {
>  		revs->show_notes = 1;
>  		revs->show_notes_given = 1;
> +		revs->notes_opt.use_default_notes = 1;
>  	} else if (!prefixcmp(arg, "--show-notes=")) {
>  		struct strbuf buf = STRBUF_INIT;
>  		revs->show_notes = 1;
>  		revs->show_notes_given = 1;
> +		if (revs->notes_opt.use_default_notes < 0)
> +			revs->notes_opt.use_default_notes = 1;

I didn't quite get this hunk while reading the series, but it is to keep
the current semantics that --show-notes=foo means "show foo in addition to
whatever the default one we are going to show anyway", and you will be
fixing that with a saner --notes in a later patch in the series.

I like it; thanks.