summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 21:00:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-25 21:00:39 (GMT)
commit212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c (patch)
tree38a1b118e0fecd672ebca21b5d49df5565b14288
parentcaf217a3b8ed4b88f58e2a151c07221d37db7abe (diff)
parente8e92e05ab3b9cda6ae3d5ddf1a83834dca7857b (diff)
downloadgit-212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c.zip
git-212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c.tar.gz
git-212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c.tar.bz2
Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'
In "git reflog expire", REACHABLE bit was not cleared from the correct objects. * jc/maint-reflog-expire-clean-mark-typofix: reflog: fix typo in "reflog expire" clean-up codepath
-rw-r--r--builtin/reflog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 1fedf66..72a0af7 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -414,7 +414,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
if (cb.unreachable_expire_kind == UE_HEAD) {
struct commit_list *elem;
for (elem = tips; elem; elem = elem->next)
- clear_commit_marks(tip_commit, REACHABLE);
+ clear_commit_marks(elem->item, REACHABLE);
free_commit_list(tips);
} else {
clear_commit_marks(tip_commit, REACHABLE);