diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
| commit | 9f5074e0348071532911cffb622d7df6754a9743 (patch) | |
| tree | fc7c2003d22ca48107e199175d857c2b32d69801 /revision.c | |
| parent | 0d181cbb8adbc964a075fd71148415f6bd431272 (diff) | |
| parent | ffa1eeaeea38f6d667e304f9b12c890b7c14d088 (diff) | |
| download | git-9f5074e0348071532911cffb622d7df6754a9743.tar.gz | |
Merge branch 'jk/maint-reflog-bottom'
* jk/maint-reflog-bottom:
reflogs: clear flags properly in corner case
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/revision.c b/revision.c index b1c18906ba..ded881263b 100644 --- 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 |