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>
Martin Koegler committed
Feb 18, 2008 at 08:31 UTC
3d51e1b5b84bde24f9a19e3cee603f0b57f62001
11 files changed
+28
-14
builtin-blame.c
+2
-1
@@ -2369,7 +2369,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
2369
* bottom commits we would reach while traversing as
2370
* uninteresting.
2371
*/
2372
- prepare_revision_walk(&revs);
2372
+ if (prepare_revision_walk(&revs))
2373
+ die("revision walk setup failed");
2374
2375
if (is_null_sha1(sb.final->object.sha1)) {
2376
char *buf;
builtin-fast-export.c
+2
-1
@@ -383,7 +383,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
383
384
get_tags_and_duplicates(&revs.pending, &extra_refs);
385
386
- prepare_revision_walk(&revs);
386
+ if (prepare_revision_walk(&revs))
387
+ die("revision walk setup failed");
388
revs.diffopt.format_callback = show_filemodify;
389
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
390
while ((commit = get_revision(&revs))) {
builtin-fmt-merge-msg.c
+2
-1
@@ -187,7 +187,8 @@ static void shortlog(const char *name, unsigned char *sha1,
187
add_pending_object(rev, branch, name);
188
add_pending_object(rev, &head->object, "^HEAD");
189
head->object.flags |= UNINTERESTING;
190
- prepare_revision_walk(rev);
190
+ if (prepare_revision_walk(rev))
191
+ die("revision walk setup failed");
192
while ((commit = get_revision(rev)) != NULL) {
193
char *oneline, *bol, *eol;
194
builtin-log.c
+8
-4
@@ -197,7 +197,8 @@ static int cmd_log_walk(struct rev_info *rev)
197
if (rev->early_output)
198
setup_early_output(rev);
199
200
- prepare_revision_walk(rev);
200
+ if (prepare_revision_walk(rev))
201
+ die("revision walk setup failed");
202
203
if (rev->early_output)
204
finish_early_output(rev);
@@ -556,7 +557,8 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha
557
o2->flags ^= UNINTERESTING;
558
add_pending_object(&check_rev, o1, "o1");
559
add_pending_object(&check_rev, o2, "o2");
559
- prepare_revision_walk(&check_rev);
560
+ if (prepare_revision_walk(&check_rev))
561
+ die("revision walk setup failed");
562
563
while ((commit = get_revision(&check_rev)) != NULL) {
564
/* ignore merges */
@@ -781,7 +783,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
783
if (!use_stdout)
784
realstdout = xfdopen(xdup(1), "w");
785
784
- prepare_revision_walk(&rev);
786
+ if (prepare_revision_walk(&rev))
787
+ die("revision walk setup failed");
788
while ((commit = get_revision(&rev)) != NULL) {
789
/* ignore merges */
790
if (commit->parents && commit->parents->next)
@@ -923,7 +926,8 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
926
die("Unknown commit %s", limit);
927
928
/* reverse the list of commits */
926
- prepare_revision_walk(&revs);
929
+ if (prepare_revision_walk(&revs))
930
+ die("revision walk setup failed");
931
while ((commit = get_revision(&revs)) != NULL) {
932
/* ignore merges */
933
if (commit->parents && commit->parents->next)
builtin-pack-objects.c
+2
-1
@@ -2033,7 +2033,8 @@ static void get_object_list(int ac, const char **av)
2033
die("bad revision '%s'", line);
2034
}
2035
2036
- prepare_revision_walk(&revs);
2036
+ if (prepare_revision_walk(&revs))
2037
+ die("revision walk setup failed");
2038
mark_edges_uninteresting(revs.commits, &revs, show_edge);
2039
traverse_commit_list(&revs, show_commit, show_object);
2040
builtin-rev-list.c
+2
-1
@@ -609,7 +609,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
609
if (bisect_list)
610
revs.limited = 1;
611
612
- prepare_revision_walk(&revs);
612
+ if (prepare_revision_walk(&revs))
613
+ die("revision walk setup failed");
614
if (revs.tree_objects)
615
mark_edges_uninteresting(revs.commits, &revs, show_edge);
616
builtin-shortlog.c
+2
-1
@@ -136,7 +136,8 @@ static void get_from_rev(struct rev_info *rev, struct path_list *list)
136
{
137
struct commit *commit;
138
139
- prepare_revision_walk(rev);
139
+ if (prepare_revision_walk(rev))
140
+ die("revision walk setup failed");
141
while ((commit = get_revision(rev)) != NULL) {
142
const char *author = NULL, *buffer;
143
bundle.c
+2
-1
@@ -128,7 +128,8 @@ int verify_bundle(struct bundle_header *header, int verbose)
128
add_object_array(e->item, e->name, &refs);
129
}
130
131
- prepare_revision_walk(&revs);
131
+ if (prepare_revision_walk(&revs))
132
+ die("revision walk setup failed");
133
134
i = req_nr;
135
while (i && (commit = get_revision(&revs)))
http-push.c
+2
-1
@@ -2383,7 +2383,8 @@ int main(int argc, char **argv)
2383
2384
/* Generate a list of objects that need to be pushed */
2385
pushing = 0;
2386
- prepare_revision_walk(&revs);
2386
+ if (prepare_revision_walk(&revs))
2387
+ die("revision walk setup failed");
2388
mark_edges_uninteresting(revs.commits);
2389
objects_to_send = get_delta(&revs, ref_lock);
2390
finish_all_active_slots();
reachable.c
+2
-1
@@ -215,6 +215,7 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog)
215
* Set up the revision walk - this will move all commits
216
* from the pending list to the commit walking list.
217
*/
218
- prepare_revision_walk(revs);
218
+ if (prepare_revision_walk(revs))
219
+ die("revision walk setup failed");
220
walk_commit_list(revs);
221
}
upload-pack.c
+2
-1
@@ -129,7 +129,8 @@ static int do_rev_list(int fd, void *create_full_pack)
129
}
130
setup_revisions(0, NULL, &revs, NULL);
131
}
132
- prepare_revision_walk(&revs);
132
+ if (prepare_revision_walk(&revs))
133
+ die("revision walk setup failed");
134
mark_edges_uninteresting(revs.commits, &revs, show_edge);
135
traverse_commit_list(&revs, show_commit, show_object);
136
return 0;