aboutsummaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-03 12:09:48 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-03 12:14:53 -0700
commitc0234b2ef6a8eaa27d9d93c4c96b36d9e82ebf9c (patch)
tree9b6c8bfc8ce385e98044ebe5bed9ed7676d0f0ae /remote.c
parent94fcb730ff665d356689f3d30e20e0fd75c6f62f (diff)
downloadgit-c0234b2ef6a8eaa27d9d93c4c96b36d9e82ebf9c.tar.gz
git-c0234b2ef6a8eaa27d9d93c4c96b36d9e82ebf9c.tar.xz
stat_tracking_info(): clear object flags used during counting
When left-right traversal counts the commits in a diverged history, it leaves the flags in the commits smudged, and we need to clear them before we return. Otherwise the caller cannot inspect other branches with this function again. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/remote.c b/remote.c
index bd5c3be3e..df8bd72ba 100644
--- a/remote.c
+++ b/remote.c
@@ -1295,6 +1295,10 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
else
(*num_theirs)++;
}
+
+ /* clear object flags smudged by the above traversal */
+ clear_commit_marks(ours, ALL_REV_FLAGS);
+ clear_commit_marks(theirs, ALL_REV_FLAGS);
return 1;
}