summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 12:39:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 12:39:51 -0700
commit1d663835799f4c654fd46733e04fbaaaa0baf63a (patch)
treee68d3d42f0388e9affdec78138d54f00e2f6ff37 /builtin
parentStart preparing for 1.8.2.1 (diff)
parentreflog: fix typo in "reflog expire" clean-up codepath (diff)
downloadtgif-1d663835799f4c654fd46733e04fbaaaa0baf63a.tar.xz
Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint
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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/reflog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 1fedf66329..72a0af70c3 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);