diff options
| author | Jeff King <peff@peff.net> | 2011-03-29 20:57:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-29 21:31:59 (GMT) |
| commit | 3a03cf6b1d1cf5d05edec1781446a26782eaff09 (patch) | |
| tree | 3b1e226b602b44680576bb4cf099a61bafa00884 /revision.c | |
| parent | 304cc11c6566cf22e811aa791988c61b6d291973 (diff) | |
| download | git-3a03cf6b1d1cf5d05edec1781446a26782eaff09.zip git-3a03cf6b1d1cf5d05edec1781446a26782eaff09.tar.gz git-3a03cf6b1d1cf5d05edec1781446a26782eaff09.tar.bz2 | |
notes: refactor display notes default handling
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -955,6 +955,8 @@ void init_revisions(struct rev_info *revs, const char *prefix) revs->diffopt.prefix = prefix; revs->diffopt.prefix_length = strlen(prefix); } + + revs->notes_opt.use_default_notes = -1; } static void add_pending_commit_list(struct rev_info *revs, @@ -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; strbuf_addstr(&buf, arg+13); expand_notes_ref(&buf); string_list_append(&revs->notes_opt.extra_notes_refs, @@ -1381,9 +1386,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->show_notes_given = 1; } else if (!strcmp(arg, "--standard-notes")) { revs->show_notes_given = 1; - revs->notes_opt.suppress_default_notes = 0; + revs->notes_opt.use_default_notes = 1; } else if (!strcmp(arg, "--no-standard-notes")) { - revs->notes_opt.suppress_default_notes = 1; + revs->notes_opt.use_default_notes = 0; } else if (!strcmp(arg, "--oneline")) { revs->verbose_header = 1; get_commit_format("oneline", revs); |