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>
This commit is contained in:
parent
24e8a3c946
commit
3d51e1b5b8
@ -2369,7 +2369,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
|
|||||||
* bottom commits we would reach while traversing as
|
* bottom commits we would reach while traversing as
|
||||||
* uninteresting.
|
* uninteresting.
|
||||||
*/
|
*/
|
||||||
prepare_revision_walk(&revs);
|
if (prepare_revision_walk(&revs))
|
||||||
|
die("revision walk setup failed");
|
||||||
|
|
||||||
if (is_null_sha1(sb.final->object.sha1)) {
|
if (is_null_sha1(sb.final->object.sha1)) {
|
||||||
char *buf;
|
char *buf;
|
||||||
|
@ -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;
|
revs.diffopt.format_callback = show_filemodify;
|
||||||
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
|
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
|
||||||
while ((commit = get_revision(&revs))) {
|
while ((commit = get_revision(&revs))) {
|
||||||
|
@ -187,7 +187,8 @@ static void shortlog(const char *name, unsigned char *sha1,
|
|||||||
add_pending_object(rev, branch, name);
|
add_pending_object(rev, branch, name);
|
||||||
add_pending_object(rev, &head->object, "^HEAD");
|
add_pending_object(rev, &head->object, "^HEAD");
|
||||||
head->object.flags |= UNINTERESTING;
|
head->object.flags |= UNINTERESTING;
|
||||||
prepare_revision_walk(rev);
|
if (prepare_revision_walk(rev))
|
||||||
|
die("revision walk setup failed");
|
||||||
while ((commit = get_revision(rev)) != NULL) {
|
while ((commit = get_revision(rev)) != NULL) {
|
||||||
char *oneline, *bol, *eol;
|
char *oneline, *bol, *eol;
|
||||||
|
|
||||||
|
@ -197,7 +197,8 @@ static int cmd_log_walk(struct rev_info *rev)
|
|||||||
if (rev->early_output)
|
if (rev->early_output)
|
||||||
setup_early_output(rev);
|
setup_early_output(rev);
|
||||||
|
|
||||||
prepare_revision_walk(rev);
|
if (prepare_revision_walk(rev))
|
||||||
|
die("revision walk setup failed");
|
||||||
|
|
||||||
if (rev->early_output)
|
if (rev->early_output)
|
||||||
finish_early_output(rev);
|
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;
|
o2->flags ^= UNINTERESTING;
|
||||||
add_pending_object(&check_rev, o1, "o1");
|
add_pending_object(&check_rev, o1, "o1");
|
||||||
add_pending_object(&check_rev, o2, "o2");
|
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) {
|
while ((commit = get_revision(&check_rev)) != NULL) {
|
||||||
/* ignore merges */
|
/* ignore merges */
|
||||||
@ -781,7 +783,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
|||||||
if (!use_stdout)
|
if (!use_stdout)
|
||||||
realstdout = xfdopen(xdup(1), "w");
|
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) {
|
while ((commit = get_revision(&rev)) != NULL) {
|
||||||
/* ignore merges */
|
/* ignore merges */
|
||||||
if (commit->parents && commit->parents->next)
|
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);
|
die("Unknown commit %s", limit);
|
||||||
|
|
||||||
/* reverse the list of commits */
|
/* 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) {
|
while ((commit = get_revision(&revs)) != NULL) {
|
||||||
/* ignore merges */
|
/* ignore merges */
|
||||||
if (commit->parents && commit->parents->next)
|
if (commit->parents && commit->parents->next)
|
||||||
|
@ -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);
|
mark_edges_uninteresting(revs.commits, &revs, show_edge);
|
||||||
traverse_commit_list(&revs, show_commit, show_object);
|
traverse_commit_list(&revs, show_commit, show_object);
|
||||||
|
|
||||||
|
@ -609,7 +609,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
|||||||
if (bisect_list)
|
if (bisect_list)
|
||||||
revs.limited = 1;
|
revs.limited = 1;
|
||||||
|
|
||||||
prepare_revision_walk(&revs);
|
if (prepare_revision_walk(&revs))
|
||||||
|
die("revision walk setup failed");
|
||||||
if (revs.tree_objects)
|
if (revs.tree_objects)
|
||||||
mark_edges_uninteresting(revs.commits, &revs, show_edge);
|
mark_edges_uninteresting(revs.commits, &revs, show_edge);
|
||||||
|
|
||||||
|
@ -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) {
|
while ((commit = get_revision(rev)) != NULL) {
|
||||||
const char *author = NULL, *buffer;
|
const char *author = NULL, *buffer;
|
||||||
|
|
||||||
|
3
bundle.c
3
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;
|
i = req_nr;
|
||||||
while (i && (commit = get_revision(&revs)))
|
while (i && (commit = get_revision(&revs)))
|
||||||
|
@ -2383,7 +2383,8 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
/* Generate a list of objects that need to be pushed */
|
/* Generate a list of objects that need to be pushed */
|
||||||
pushing = 0;
|
pushing = 0;
|
||||||
prepare_revision_walk(&revs);
|
if (prepare_revision_walk(&revs))
|
||||||
|
die("revision walk setup failed");
|
||||||
mark_edges_uninteresting(revs.commits);
|
mark_edges_uninteresting(revs.commits);
|
||||||
objects_to_send = get_delta(&revs, ref_lock);
|
objects_to_send = get_delta(&revs, ref_lock);
|
||||||
finish_all_active_slots();
|
finish_all_active_slots();
|
||||||
|
@ -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
|
* Set up the revision walk - this will move all commits
|
||||||
* from the pending list to the commit walking list.
|
* 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);
|
||||||
}
|
}
|
||||||
|
@ -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);
|
mark_edges_uninteresting(revs.commits, &revs, show_edge);
|
||||||
traverse_commit_list(&revs, show_commit, show_object);
|
traverse_commit_list(&revs, show_commit, show_object);
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user