Skip to content

Commit 715b63c

Browse files
committed
Merge branch 'sb/prepare-revision-walk-error-check'
* sb/prepare-revision-walk-error-check: prepare_revision_walk(): check for return value in all places
2 parents 929df99 + 81c3ce3 commit 715b63c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

builtin/branch.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,9 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
653653
add_pending_object(&ref_list.revs,
654654
(struct object *) filter, "");
655655
ref_list.revs.limited = 1;
656-
prepare_revision_walk(&ref_list.revs);
656+
657+
if (prepare_revision_walk(&ref_list.revs))
658+
die(_("revision walk setup failed"));
657659
if (verbose)
658660
ref_list.maxwidth = calc_maxwidth(&ref_list);
659661
}

builtin/commit.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,8 @@ static const char *find_author_by_nickname(const char *name)
10611061
revs.mailmap = &mailmap;
10621062
read_mailmap(revs.mailmap, NULL);
10631063

1064-
prepare_revision_walk(&revs);
1064+
if (prepare_revision_walk(&revs))
1065+
die(_("revision walk setup failed"));
10651066
commit = get_revision(&revs);
10661067
if (commit) {
10671068
struct pretty_print_context ctx = {0};

remote.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1922,7 +1922,8 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
19221922

19231923
init_revisions(&revs, NULL);
19241924
setup_revisions(rev_argc, rev_argv, &revs, NULL);
1925-
prepare_revision_walk(&revs);
1925+
if (prepare_revision_walk(&revs))
1926+
die("revision walk setup failed");
19261927

19271928
/* ... and count the commits on each side. */
19281929
*num_ours = 0;

0 commit comments

Comments
 (0)