Merge branch 'sb/prepare-revision-walk-error-check'

* sb/prepare-revision-walk-error-check:
  prepare_revision_walk(): check for return value in all places
This commit is contained in:
Junio C Hamano 2014-09-09 12:54:03 -07:00
commit 715b63ceb3
3 changed files with 7 additions and 3 deletions

View File

@ -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);
}

View File

@ -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};

View File

@ -1922,7 +1922,8 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
init_revisions(&revs, NULL);
setup_revisions(rev_argc, rev_argv, &revs, NULL);
prepare_revision_walk(&revs);
if (prepare_revision_walk(&revs))
die("revision walk setup failed");
/* ... and count the commits on each side. */
*num_ours = 0;