Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-p4: Clean up git-p4 submit's log message handling.
[gitweb.git]
/
commit.c
diff --git
a/commit.c
b/commit.c
index 5d57450de36911ccc37db95cc0701d242cb0ef04..22ce7768639465f896e52b08a73cf5605940700b 100644
(file)
--- 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);
}