diff options
| author | Jeff King <peff@peff.net> | 2011-03-20 05:09:18 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 13:32:45 -0700 |
| commit | 5c08dc48a8cf987c3a14006b5a82651e9b3f5423 (patch) | |
| tree | c4dd55a9349bbc2516a7cb3ae0bb4cfe7aee1a22 /t/t2020-checkout-detach.sh | |
| parent | 493dd6ed5b46659d7e20aaef00f97e279ce1c4cb (diff) | |
| download | git-5c08dc48a8cf987c3a14006b5a82651e9b3f5423.tar.gz git-5c08dc48a8cf987c3a14006b5a82651e9b3f5423.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2020-checkout-detach.sh')
| -rwxr-xr-x | t/t2020-checkout-detach.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index bfeb2a651..569b27fe8 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 |