summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:01 (GMT)
commit67bc7407211d26de518811dafc2c1cf2e6124709 (patch)
tree6fffca8665145d1f3164abce6d980f8c537e1343 /revision.c
parentf986eecde1e59fc4cc2b0b761ffc0fe563dad267 (diff)
parent7dccadf363f9d9ff564ad34117266b2d557a2bc8 (diff)
downloadgit-67bc7407211d26de518811dafc2c1cf2e6124709.zip
git-67bc7407211d26de518811dafc2c1cf2e6124709.tar.gz
git-67bc7407211d26de518811dafc2c1cf2e6124709.tar.bz2
Merge branch 'jc/maint-limit-note-output'
* jc/maint-limit-note-output: Fix "log --oneline" not to show notes Fix "log" family not to be too agressive about showing notes
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 25fa14d..f3b82d9 100644
--- a/revision.c
+++ b/revision.c
@@ -1161,13 +1161,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->verbose_header = 1;
} else if (!strcmp(arg, "--pretty")) {
revs->verbose_header = 1;
+ revs->pretty_given = 1;
get_commit_format(arg+8, revs);
} else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
revs->verbose_header = 1;
+ revs->pretty_given = 1;
get_commit_format(arg+9, revs);
+ } else if (!strcmp(arg, "--show-notes")) {
+ revs->show_notes = 1;
+ revs->show_notes_given = 1;
+ } else if (!strcmp(arg, "--no-notes")) {
+ revs->show_notes = 0;
+ revs->show_notes_given = 1;
} else if (!strcmp(arg, "--oneline")) {
revs->verbose_header = 1;
get_commit_format("oneline", revs);
+ revs->pretty_given = 1;
revs->abbrev_commit = 1;
} else if (!strcmp(arg, "--graph")) {
revs->topo_order = 1;