summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-03-29 16:57:47 -0400
committerJunio C Hamano <gitster@pobox.com>2011-03-29 14:38:55 -0700
commit7249e91287443c02b2c7eed272a579dae44984ad (patch)
treed9a74c891d223997ff9866bddeb4b6c623a1cbb3 /revision.c
parent3a03cf6b1d1cf5d05edec1781446a26782eaff09 (diff)
downloadgit-7249e91287443c02b2c7eed272a579dae44984ad.tar.gz
revision.c: support --notes command-line option
We already have --show-notes, but it has a few shortcomings: 1. Using --show-notes=<ref> implies that we should also show the default notes. Which means you also need to use --no-standard-notes if you want to suppress them. 2. It is negated by --no-notes, which doesn't match. 3. It's too long to type. :) This patch introduces --notes, which behaves exactly like --show-notes, except that using "--notes=<ref>" does not imply showing the default notes. 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.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/revision.c b/revision.c
index 315a7f4319..c4ffee4649 100644
--- a/revision.c
+++ b/revision.c
@@ -1367,17 +1367,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->verbose_header = 1;
revs->pretty_given = 1;
get_commit_format(arg+9, revs);
- } else if (!strcmp(arg, "--show-notes")) {
+ } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
revs->show_notes = 1;
revs->show_notes_given = 1;
revs->notes_opt.use_default_notes = 1;
- } else if (!prefixcmp(arg, "--show-notes=")) {
+ } else if (!prefixcmp(arg, "--show-notes=") ||
+ !prefixcmp(arg, "--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);
+ if (!prefixcmp(arg, "--show-notes")) {
+ if (revs->notes_opt.use_default_notes < 0)
+ revs->notes_opt.use_default_notes = 1;
+ strbuf_addstr(&buf, arg+13);
+ }
+ else
+ strbuf_addstr(&buf, arg+8);
expand_notes_ref(&buf);
string_list_append(&revs->notes_opt.extra_notes_refs,
strbuf_detach(&buf, NULL));