diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:35:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:35:50 -0800 |
commit | 006f424b2d014b8a7c4887b7ddbb57256dd6b8c7 (patch) | |
tree | e940ac6eff3809dfe3864c3861dfb66dfb3640de /revision.c | |
parent | 37ad7ca7dbb0bef2b902f6bc7d3346ddff1667a5 (diff) | |
parent | ffa1eeaeea38f6d667e304f9b12c890b7c14d088 (diff) | |
download | git-006f424b2d014b8a7c4887b7ddbb57256dd6b8c7.tar.gz git-006f424b2d014b8a7c4887b7ddbb57256dd6b8c7.tar.xz |
Merge branch 'jk/maint-reflog-bottom' into maint
* 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 b1c18906b..ded881263 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 |