Merge branch 'so/rebase-doc'

diff --git a/builtin/branch.c b/builtin/branch.c
index 0591b22a483619ac9a7d889a49e45ffa9d68ab72..ced422b627fc05c462f6be8b6c20ee0ba9ff2628 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -653,7 +653,9 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
                add_pending_object(&ref_list.revs,
                                   (struct object *) filter, "");
                ref_list.revs.limited = 1;
-               prepare_revision_walk(&ref_list.revs);
+
+               if (prepare_revision_walk(&ref_list.revs))
+                       die(_("revision walk setup failed"));
                if (verbose)
                        ref_list.maxwidth = calc_maxwidth(&ref_list);
        }