summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@gmail.com>2014-08-10 23:33:26 +0200
committerJunio C Hamano <gitster@pobox.com>2014-08-12 11:00:33 -0700
commit81c3ce3cdce8dffb913243f5b2cc09d9fb966e6c (patch)
tree974a155e73dec708825519c9f21a44d678bc86ed
parent32f56600bb6ac6fc57183e79d2c1515dfa56672f (diff)
downloadgit-sb/prepare-revision-walk-error-check.tar.gz
prepare_revision_walk(): check for return value in all placessb/prepare-revision-walk-error-check
Even the documentation tells us: You should check if it returns any error (non-zero return code) and if it does not, you can start using get_revision() to do the iteration. In preparation for this commit, I grepped all occurrences of prepare_revision_walk and added error messages, when there were none. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/branch.c4
-rw-r--r--builtin/commit.c3
-rw-r--r--remote.c3
3 files changed, 7 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 652b1d2d14..e91ecc6fbd 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 39cf8976e3..447ded63fd 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -989,7 +989,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};
diff --git a/remote.c b/remote.c
index 0e9459cc06..dc0c427968 100644
--- a/remote.c
+++ b/remote.c
@@ -1898,7 +1898,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;