Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 7ae255862aaa43fb20969b75d9e434902ec2cba1..4c46341749ae4a2a8eb90af81b7b1fc4bfcf2c90 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -346,6 +346,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);