git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/6] notes: refactor display notes default handling

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 29, 2011, 22:02 UTC
Message-ID
<7vfwq5poua.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110329205727.GD23466@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 26 quoted lines
> 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.
Previous: Jeff KingNext: Jeff King
Message 11 of 23 in “revision.c: introduce --notes-ref= to use one notes ref only”
  1. revision.c: introduce --notes-ref= to use one notes ref onlyMichael J Gruber, Mar 29, 2011
  2. Johan HerlandMar 29, 2011
  3. Jeff KingMar 29, 2011
  4. Michael J GruberMar 29, 2011
  5. Junio C HamanoMar 29, 2011
  6. Jeff KingMar 29, 2011
  7. 1/6 notes: make expand_notes_ref globally accessibleJeff King, Mar 29, 2011
  8. 2/6 revision.c: refactor notes ref expansionJeff King, Mar 29, 2011
  9. 3/6 notes: refactor display notes extra refs fieldJeff King, Mar 29, 2011
  10. 4/6 notes: refactor display notes default handlingJeff King, Mar 29, 2011
  11. Junio C HamanoMar 29, 2011
  12. 5/6 revision.c: support --notes command-line optionJeff King, Mar 29, 2011
  13. 6/6 revision.c: make --no-notes reset --notes listJeff King, Mar 29, 2011
  14. Junio C HamanoMar 29, 2011
  15. Johan HerlandMar 29, 2011
  16. 7/6 log/pretty-options: Document --[no-]notes and deprecate old notes optionsJohan Herland, Mar 29, 2011
  17. Jeff KingMar 30, 2011
  18. 7/6 log/pretty-options: Document --[no-]notes and deprecate old notes optionsJohan Herland, Mar 30, 2011
  19. Jeff KingMar 30, 2011
  20. Jeff KingMar 29, 2011
  21. Jeff KingMar 29, 2011
  22. Michael J GruberMar 29, 2011
  23. Jeff KingMar 29, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.