summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-04 02:17:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-04 02:17:53 (GMT)
commite654e3b574bf1e4cc7556c2f01188eaf41271901 (patch)
tree0b4c602a405775accc9c51fcfd4a77487e89dab8 /builtin
parentfa6d3749edce0a5ba8c9150f984cc307e0092d0d (diff)
parent2aea7a51a11598427d5b57e4bc042930d592547f (diff)
downloadgit-e654e3b574bf1e4cc7556c2f01188eaf41271901.zip
git-e654e3b574bf1e4cc7556c2f01188eaf41271901.tar.gz
git-e654e3b574bf1e4cc7556c2f01188eaf41271901.tar.bz2
Merge branch 'jk/rev-list-has-no-notes' into maint
"git rev-list" does not take "--notes" option, but did not complain when one is given. * jk/rev-list-has-no-notes: rev-list: make it obvious that we do not support notes
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rev-list.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index c0b4b53..d80d1ed 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -350,6 +350,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
revs.diff)
usage(rev_list_usage);
+ if (revs.show_notes)
+ die(_("rev-list does not support display of notes"));
+
save_commit_buffer = (revs.verbose_header ||
revs.grep_filter.pattern_list ||
revs.grep_filter.header_list);