Merge branch 'jk/maint-reflog-bottom'

* jk/maint-reflog-bottom:
  reflogs: clear flags properly in corner case
This commit is contained in:
Junio C Hamano
2010-12-12 21:49:51 -08:00
3 changed files with 37 additions and 2 deletions

View File

@ -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