summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2009-03-26 21:53:24 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-27 01:08:36 -0700
commit57dac0bfe43a68d55e16def58b8ed305e0676d3f (patch)
treec150aadcef8902f1cbbf26140df34027e326ece0
parentMerge branch 'maint' (diff)
downloadtgif-57dac0bfe43a68d55e16def58b8ed305e0676d3f.tar.xz
Test for local branches being followed with --track
According to the documentation, it is perfectly okay to follow local branches using the --track option. Introduce a test which checks whether they behave the same. Currently one test fails. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6040-tracking-info.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index ba9060190d..2a2b6b63d5 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_failure 'checkout with local tracked branch' '
+ git checkout master &&
+ git checkout follower >actual
+ grep "is ahead of" actual
+'
+
test_expect_success 'status' '
(
cd test &&