git-p4: add gitConfigInt reader

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index ee9e8725bb241ab6f684dc09c01d59388a74930f..d80d1ed35944144aa0aeeeb1b0e08c9efdec6523 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -350,13 +350,16 @@ 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);
        if (bisect_list)
                revs.limited = 1;
 
-       if (use_bitmap_index) {
+       if (use_bitmap_index && !revs.prune) {
                if (revs.count && !revs.left_right && !revs.cherry_mark) {
                        uint32_t commit_count;
                        if (!prepare_bitmap_walk(&revs)) {