summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>2008-02-18 20:48:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-19 04:49:13 (GMT)
commitdec38c81657f02624752a65c24d72613316713f5 (patch)
tree7374e801dde04ec87a62fa4740c5a233523cac2c /commit.c
parent9786f68bfcc082778aee74159540e341bb239514 (diff)
downloadgit-dec38c81657f02624752a65c24d72613316713f5.zip
git-dec38c81657f02624752a65c24d72613316713f5.tar.gz
git-dec38c81657f02624752a65c24d72613316713f5.tar.bz2
check return value from parse_commit() in various functions
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index 5d57450..22ce776 100644
--- a/commit.c
+++ b/commit.c
@@ -387,8 +387,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
while (parents) {
struct commit *commit = parents->item;
- parse_commit(commit);
- if (!(commit->object.flags & mark)) {
+ if (!parse_commit(commit) && !(commit->object.flags & mark)) {
commit->object.flags |= mark;
insert_by_date(commit, list);
}