kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* sb/prepare-revision-walk-error-check:
  prepare_revision_walk(): check for return value in all places
maint
Junio C Hamano 2014-09-09 12:54:03 -07:00
parent 929df991c2 81c3ce3cdc
commit 715b63ceb3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/branch.c
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, add_pending_object(&ref_list.revs,
(struct object *) filter, ""); (struct object *) filter, "");
ref_list.revs.limited = 1; 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) if (verbose)
ref_list.maxwidth = calc_maxwidth(&ref_list); ref_list.maxwidth = calc_maxwidth(&ref_list);
} }

3
builtin/commit.c
View File

@ -1061,7 +1061,8 @@ static const char *find_author_by_nickname(const char *name)
revs.mailmap = &mailmap; revs.mailmap = &mailmap;
read_mailmap(revs.mailmap, NULL); read_mailmap(revs.mailmap, NULL);


prepare_revision_walk(&revs); if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
commit = get_revision(&revs); commit = get_revision(&revs);
if (commit) { if (commit) {
struct pretty_print_context ctx = {0}; struct pretty_print_context ctx = {0};

3
remote.c
View File

@ -1922,7 +1922,8 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)


init_revisions(&revs, NULL); init_revisions(&revs, NULL);
setup_revisions(rev_argc, rev_argv, &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. */ /* ... and count the commits on each side. */
*num_ours = 0; *num_ours = 0;