Merge branch 'mz/rebase-abort-reflog-fix'

diff --git a/revision.c b/revision.c
index b1c18906badc5fc4ce3af48daa7c226365e3c08f..ded881263ba0ff703d9fd468e6785270ea68df5f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2030,8 +2030,10 @@ static struct commit *get_revision_1(struct rev_info *revs)
                revs->commits = entry->next;
                free(entry);
 
-               if (revs->reflog_info)
+               if (revs->reflog_info) {
                        fake_reflog_parent(revs->reflog_info, commit);
+                       commit->object.flags &= ~(ADDED | SEEN | SHOWN);
+               }
 
                /*
                 * If we haven't done the list limiting, we need to look at