Teach rev-parse the ... syntax.

diff --git a/commit.c b/commit.c
index 12882fd496e5c18dacae76a6c68784700ce63721..04390643e8a26d38af32268610ad46d6095f81b7 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -397,12 +397,13 @@ void clear_commit_marks(struct commit *commit, unsigned int mark)
 {
        struct commit_list *parents;
 
-       if (!commit)
-               return;
        parents = commit->parents;
        commit->object.flags &= ~mark;
        while (parents) {
-               clear_commit_marks(parents->item, mark);
+               struct commit *parent = parents->item;
+               if (parent && parent->object.parsed &&
+                   (parent->object.flags & mark))
+                       clear_commit_marks(parent, mark);
                parents = parents->next;
        }
 }
@@ -1082,10 +1083,8 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
        }
 
  finish:
-       if (cleanup) {
-               clear_commit_marks(rev1, PARENT1 | PARENT2 | STALE);
-               clear_commit_marks(rev2, PARENT1 | PARENT2 | STALE);
-       }
+       if (cleanup)
+               clear_object_marks(PARENT1 | PARENT2 | STALE);
 
        return result;
 }