check return code of prepare_revision_walk

A failure in prepare_revision_walk can be caused by
a not parseable object.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-blame.c b/builtin-blame.c
index 1cf254dcca7f814694741ce5ea1ec2b88a26706f..2d4a3e150081e350ebe28fd3e677708a94c1f548 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2369,7 +2369,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
         * bottom commits we would reach while traversing as
         * uninteresting.
         */
         * bottom commits we would reach while traversing as
         * uninteresting.
         */

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

 
        if (is_null_sha1(sb.final->object.sha1)) {
                char *buf;
 
        if (is_null_sha1(sb.final->object.sha1)) {
                char *buf;

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index ef27eee71bdef2cac6f751e07b1da71588989b03..f741df522014b9495f18cf13c2e01382da71c41d 100755 (executable)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -383,7 +383,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);
 
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);
 

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

        revs.diffopt.format_callback = show_filemodify;
        DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
        while ((commit = get_revision(&revs))) {
        revs.diffopt.format_callback = show_filemodify;
        DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
        while ((commit = get_revision(&revs))) {

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 6163bd4975e3e361e36ffc89ea4c91d0edd02949..ebb3f37cf158dc479f364111893279805fa9a230 100644 (file)
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -187,7 +187,8 @@ static void shortlog(const char *name, unsigned char *sha1,
        add_pending_object(rev, branch, name);
        add_pending_object(rev, &head->object, "^HEAD");
        head->object.flags |= UNINTERESTING;
        add_pending_object(rev, branch, name);
        add_pending_object(rev, &head->object, "^HEAD");
        head->object.flags |= UNINTERESTING;

-       prepare_revision_walk(rev);
+       if (prepare_revision_walk(rev))
+               die("revision walk setup failed");

        while ((commit = get_revision(rev)) != NULL) {
                char *oneline, *bol, *eol;
 
        while ((commit = get_revision(rev)) != NULL) {
                char *oneline, *bol, *eol;
 

diff --git a/builtin-log.c b/builtin-log.c
index 99d69f079132ed67e2d5bc83bf95e6e60ba22f6f..5fea64abad5d2f87cc0267a4cb2fa3bc621d969d 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -197,7 +197,8 @@ static int cmd_log_walk(struct rev_info *rev)
        if (rev->early_output)
                setup_early_output(rev);
 
        if (rev->early_output)
                setup_early_output(rev);
 

-       prepare_revision_walk(rev);
+       if (prepare_revision_walk(rev))
+               die("revision walk setup failed");

 
        if (rev->early_output)
                finish_early_output(rev);
 
        if (rev->early_output)
                finish_early_output(rev);


@@ -556,7 +557,8 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha
        o2->flags ^= UNINTERESTING;
        add_pending_object(&check_rev, o1, "o1");
        add_pending_object(&check_rev, o2, "o2");
        o2->flags ^= UNINTERESTING;
        add_pending_object(&check_rev, o1, "o1");
        add_pending_object(&check_rev, o2, "o2");

-       prepare_revision_walk(&check_rev);
+       if (prepare_revision_walk(&check_rev))
+               die("revision walk setup failed");

 
        while ((commit = get_revision(&check_rev)) != NULL) {
                /* ignore merges */
 
        while ((commit = get_revision(&check_rev)) != NULL) {
                /* ignore merges */


@@ -781,7 +783,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        if (!use_stdout)
                realstdout = xfdopen(xdup(1), "w");
 
        if (!use_stdout)
                realstdout = xfdopen(xdup(1), "w");
 

-       prepare_revision_walk(&rev);
+       if (prepare_revision_walk(&rev))
+               die("revision walk setup failed");

        while ((commit = get_revision(&rev)) != NULL) {
                /* ignore merges */
                if (commit->parents && commit->parents->next)
        while ((commit = get_revision(&rev)) != NULL) {
                /* ignore merges */
                if (commit->parents && commit->parents->next)


@@ -923,7 +926,8 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
                die("Unknown commit %s", limit);
 
        /* reverse the list of commits */
                die("Unknown commit %s", limit);
 
        /* reverse the list of commits */

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

        while ((commit = get_revision(&revs)) != NULL) {
                /* ignore merges */
                if (commit->parents && commit->parents->next)
        while ((commit = get_revision(&revs)) != NULL) {
                /* ignore merges */
                if (commit->parents && commit->parents->next)

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 692a76126b027133fd046f03003fe8e49218f192..d2bb12e574fb8e18f9b1e3d241f73f732ac740d3 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -2033,7 +2033,8 @@ static void get_object_list(int ac, const char **av)
                        die("bad revision '%s'", line);
        }
 
                        die("bad revision '%s'", line);
        }
 

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

        mark_edges_uninteresting(revs.commits, &revs, show_edge);
        traverse_commit_list(&revs, show_commit, show_object);
 
        mark_edges_uninteresting(revs.commits, &revs, show_edge);
        traverse_commit_list(&revs, show_commit, show_object);
 

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index de80158fd4762aa692193edb7c0f8e85e6189877..9426081dae17e0a3ce536c8b4ffc038b32eda8a7 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -609,7 +609,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
        if (bisect_list)
                revs.limited = 1;
 
        if (bisect_list)
                revs.limited = 1;
 

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

        if (revs.tree_objects)
                mark_edges_uninteresting(revs.commits, &revs, show_edge);
 
        if (revs.tree_objects)
                mark_edges_uninteresting(revs.commits, &revs, show_edge);
 

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index fa8bc7d02a2268d99dcc829cb3adbee10c949306..0055a57aeb24392de0dcf337bb93f30fceccd88f 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -136,7 +136,8 @@ static void get_from_rev(struct rev_info *rev, struct path_list *list)
 {
        struct commit *commit;
 
 {
        struct commit *commit;
 

-       prepare_revision_walk(rev);
+       if (prepare_revision_walk(rev))
+               die("revision walk setup failed");

        while ((commit = get_revision(rev)) != NULL) {
                const char *author = NULL, *buffer;
 
        while ((commit = get_revision(rev)) != NULL) {
                const char *author = NULL, *buffer;
 

diff --git a/bundle.c b/bundle.c
index 5c95eca07d19a6d3ed4e9000b5bb47eef90ff66e..bd12ec8537781c5c82e77637312ccabb708d5040 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -128,7 +128,8 @@ int verify_bundle(struct bundle_header *header, int verbose)
                add_object_array(e->item, e->name, &refs);
        }
 
                add_object_array(e->item, e->name, &refs);
        }
 

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

 
        i = req_nr;
        while (i && (commit = get_revision(&revs)))
 
        i = req_nr;
        while (i && (commit = get_revision(&revs)))

diff --git a/http-push.c b/http-push.c
index b2b410df902f2a4f2bca634d82cf103d288c9042..63ff218b3c2a9d006ec95f20e7c1cd3a0808dffa 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -2383,7 +2383,8 @@ int main(int argc, char **argv)
 
                /* Generate a list of objects that need to be pushed */
                pushing = 0;
 
                /* Generate a list of objects that need to be pushed */
                pushing = 0;

-               prepare_revision_walk(&revs);
+               if (prepare_revision_walk(&revs))
+                       die("revision walk setup failed");

                mark_edges_uninteresting(revs.commits);
                objects_to_send = get_delta(&revs, ref_lock);
                finish_all_active_slots();
                mark_edges_uninteresting(revs.commits);
                objects_to_send = get_delta(&revs, ref_lock);
                finish_all_active_slots();

diff --git a/reachable.c b/reachable.c
index 00f289f2f470c0f4b95e0fcac043aa2e054d1ce6..823e3242ec126a5d55c36b24eb8699a2efecad52 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -215,6 +215,7 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog)
         * Set up the revision walk - this will move all commits
         * from the pending list to the commit walking list.
         */
         * Set up the revision walk - this will move all commits
         * from the pending list to the commit walking list.
         */

-       prepare_revision_walk(revs);
+       if (prepare_revision_walk(revs))
+               die("revision walk setup failed");

        walk_commit_list(revs);
 }
        walk_commit_list(revs);
 }

diff --git a/upload-pack.c b/upload-pack.c
index eaea9990e944ead3d03967bcb026539cd2dc39eb..de147853b5546f90190654844c765b0ea44902af 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -129,7 +129,8 @@ static int do_rev_list(int fd, void *create_full_pack)
                }
                setup_revisions(0, NULL, &revs, NULL);
        }
                }
                setup_revisions(0, NULL, &revs, NULL);
        }

-       prepare_revision_walk(&revs);
+       if (prepare_revision_walk(&revs))
+               die("revision walk setup failed");

        mark_edges_uninteresting(revs.commits, &revs, show_edge);
        traverse_commit_list(&revs, show_commit, show_object);
        return 0;
        mark_edges_uninteresting(revs.commits, &revs, show_edge);
        traverse_commit_list(&revs, show_commit, show_object);
        return 0;