Merge branch 'jc/boundary'

* jc/boundary:
rev-list --boundary: show boundary commits even when limited otherwise.

diff --git a/commit.c b/commit.c
index 05c4c923faaa1b2ee0c48ebc4230657fbbab6077..2717dd81c346d89bf5d6727e3aa1f5b65ff39aca 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -160,7 +160,7 @@ struct commit_graft *read_graft_line(char *buf, int len)
 
        if (buf[len-1] == '\n')
                buf[--len] = 0;
-       if (buf[0] == '#')
+       if (buf[0] == '#' || buf[0] == '\0')
                return NULL;
        if ((len + 1) % 41) {
        bad_graft_data:

diff --git a/rev-list.c b/rev-list.c
index f5511e72db103ea2b549b48e84985969a94c5485..a8fe83c5d805ea8944a07be3832977487b41080d 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -371,6 +371,8 @@ int main(int argc, const char **argv)
 
        save_commit_buffer = verbose_header;
        track_object_refs = 0;
+       if (bisect_list)
+               revs.limited = 1;
 
        prepare_revision_walk(&revs);
        if (revs.tree_objects)