From 5c08dc48a8cf987c3a14006b5a82651e9b3f5423 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 20 Mar 2011 05:09:18 -0400 Subject: checkout: clear commit marks after detached-orphan check When leaving a detached HEAD, we do a revision walk to make sure the commit we are leaving isn't being orphaned. However, this leaves crufty marks in the commit objects which can confuse later walkers, like the one in stat_tracking_info. Let's clean up after ourselves to prevent this conflict. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t2020-checkout-detach.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 't/t2020-checkout-detach.sh') diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index bfeb2a6512..569b27fe8d 100755 --- a/t/t2020-checkout-detach.sh +++ b/t/t2020-checkout-detach.sh @@ -126,4 +126,17 @@ test_expect_success 'checkout does not warn leaving reachable commit' ' check_no_orphan_warning stderr ' +cat >expect <<'EOF' +Your branch is behind 'master' by 1 commit, and can be fast-forwarded. +EOF +test_expect_success 'tracking count is accurate after orphan check' ' + reset && + git branch child master^ && + git config branch.child.remote . && + git config branch.child.merge refs/heads/master && + git checkout child^ && + git checkout child >stdout && + test_cmp expect stdout +' + test_done -- cgit v1.2.1