summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-13 05:49:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-13 05:49:51 (GMT)
commit9f5074e0348071532911cffb622d7df6754a9743 (patch)
treefc7c2003d22ca48107e199175d857c2b32d69801 /revision.c
parent0d181cbb8adbc964a075fd71148415f6bd431272 (diff)
parentffa1eeaeea38f6d667e304f9b12c890b7c14d088 (diff)
downloadgit-9f5074e0348071532911cffb622d7df6754a9743.zip
git-9f5074e0348071532911cffb622d7df6754a9743.tar.gz
git-9f5074e0348071532911cffb622d7df6754a9743.tar.bz2
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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index b1c1890..ded8812 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