X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6040-tracking-info.sh;h=3d6db4d386a0a009892fac490818294664d188fa;hb=671d1bc6a098d1015fbdd6e085d6daf12c1dce15;hp=ba9060190d31f0b57a461c114e1c856523845f78;hpb=aa72a14a7f648ae47749281002e94cfcf36f39e2;p=git.git diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index ba9060190..3d6db4d38 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -29,7 +29,9 @@ test_expect_success setup ' git checkout -b b4 origin && advance e && advance f - ) + ) && + git checkout -b follower --track master && + advance g ' script='s/^..\(b.\)[ 0-9a-f]*\[\([^]]*\)\].*/\1 \2/p' @@ -56,6 +58,12 @@ test_expect_success 'checkout' ' grep "have 1 and 1 different" actual ' +test_expect_success 'checkout with local tracked branch' ' + git checkout master && + git checkout follower >actual + grep "is ahead of" actual +' + test_expect_success 'status' ' ( cd test &&