summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>2008-02-18 08:31:56 +0100
committerJunio C Hamano <gitster@pobox.com>2008-02-17 23:51:12 -0800
commit3d51e1b5b84bde24f9a19e3cee603f0b57f62001 (patch)
treef143ea1f7bca0d42eb99b5ffcf67e9babf75c2ab /builtin-fmt-merge-msg.c
parent24e8a3c946d158c977b67c346c21abc609c63209 (diff)
downloadgit-3d51e1b5b84bde24f9a19e3cee603f0b57f62001.tar.gz
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>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
-rw-r--r--builtin-fmt-merge-msg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 6163bd4975..ebb3f37cf1 100644
--- 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;
- prepare_revision_walk(rev);
+ if (prepare_revision_walk(rev))
+ die("revision walk setup failed");
while ((commit = get_revision(rev)) != NULL) {
char *oneline, *bol, *eol;