path: root/reflog-walk.c
diff options
authorJeff King <>2010-11-22 04:42:53 (GMT)
committerJunio C Hamano <>2010-11-24 00:24:24 (GMT)
commitffa1eeaeea38f6d667e304f9b12c890b7c14d088 (patch)
tree57c2a54c528afc9f2711f5f490ee328fbb2c79f3 /reflog-walk.c
parent520ea857e66f25a681401fd534b2f0d099fd2d31 (diff)
reflogs: clear flags properly in corner case
The reflog-walking mechanism is based on the regular revision traversal. We just rewrite the parents of each commit in fake_reflog_parent to point to the commit in the next reflog entry instead of the real parents. However, the regular revision traversal tries not to show the same commit twice, and so sets the SHOWN flag on each commit it shows. In a reflog, however, we may want to see the same commit more than once if it appears in the reflog multiple times (which easily happens, for example, if you do a reset to a prior state). The fake_reflog_parent function takes care of this by clearing flags, including SHOWN. Unfortunately, it does so at the very end of the function, and it is possible to return early from the function if there is no fake parent to set up (e.g., because we are at the very first reflog entry on the branch). In such a case the flag is not cleared, and the entry is skipped by the revision traversal machinery as already shown. You can see this by walking the log of a ref which is set to its very first commit more than once (the test below shows such a situation). In this case the reflog walk will fail to show the entry for the initial creation of the ref. We don't want to simply move the flag-clearing to the top of the function; we want to make sure flags set during the fake-parent installation are also cleared. Instead, let's hoist the flag-clearing out of the fake_reflog_parent function entirely. It's not really about fake parents anyway, and the only caller is the get_revision machinery. Reported-by: Martin von Zweigbergk <> Signed-off-by: Jeff King <> Acked-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'reflog-walk.c')
1 files changed, 0 insertions, 1 deletions
diff --git a/reflog-walk.c b/reflog-walk.c
index caba4f7..0cf2f7d 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -239,7 +239,6 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
commit->parents = xcalloc(sizeof(struct commit_list), 1);
commit->parents->item = commit_info->commit;
- commit->object.flags &= ~(ADDED | SEEN | SHOWN);
void get_reflog_selector(struct strbuf *sb,