diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:03 -0700 |
| commit | 715b63ceb3c71fb748ec1e46680d96e025e9c75d (patch) | |
| tree | 156505f9d8bb9228d5ad135a6063e460ec2cfe13 /builtin | |
| parent | Merge branch 'sb/blame-msg-i18n' (diff) | |
| parent | prepare_revision_walk(): check for return value in all places (diff) | |
| download | tgif-715b63ceb3c71fb748ec1e46680d96e025e9c75d.tar.xz | |
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')
| -rw-r--r-- | builtin/branch.c | 4 | ||||
| -rw-r--r-- | builtin/commit.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 0591b22a48..ced422b627 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); } diff --git a/builtin/commit.c b/builtin/commit.c index a3eaf4b5ea..36e3a2eef2 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1061,7 +1061,8 @@ static const char *find_author_by_nickname(const char *name) revs.mailmap = &mailmap; read_mailmap(revs.mailmap, NULL); - prepare_revision_walk(&revs); + if (prepare_revision_walk(&revs)) + die(_("revision walk setup failed")); commit = get_revision(&revs); if (commit) { struct pretty_print_context ctx = {0}; |