diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:42:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:42:31 -0700 |
| commit | ccc852c37751c7bc8f81bfb71e6722291270bca5 (patch) | |
| tree | 8c4ff38a86383bba8d178fed191b2ebc521e91d6 /t | |
| parent | Merge branch 'sb/format-patch-patchname' (diff) | |
| parent | Make local branches behave like remote branches when --tracked (diff) | |
| download | tgif-ccc852c37751c7bc8f81bfb71e6722291270bca5.tar.xz | |
Merge branch 'mg/tracked-local-branches'
* mg/tracked-local-branches:
Make local branches behave like remote branches when --tracked
Test for local branches being followed with --track
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6040-tracking-info.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index ba9060190d..3d6db4d386 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 && |