summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-09 19:54:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-09 19:54:03 (GMT)
commit715b63ceb3c71fb748ec1e46680d96e025e9c75d (patch)
tree156505f9d8bb9228d5ad135a6063e460ec2cfe13 /builtin/branch.c
parent929df991c25497ecdaf1cd605eec1b3ac4f1c6e5 (diff)
parent81c3ce3cdce8dffb913243f5b2cc09d9fb966e6c (diff)
downloadgit-715b63ceb3c71fb748ec1e46680d96e025e9c75d.zip
git-715b63ceb3c71fb748ec1e46680d96e025e9c75d.tar.gz
git-715b63ceb3c71fb748ec1e46680d96e025e9c75d.tar.bz2
Merge branch 'sb/prepare-revision-walk-error-check'
* sb/prepare-revision-walk-error-check: prepare_revision_walk(): check for return value in all places
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 0591b22..ced422b 100644
--- 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);
}