aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2008-03-17 22:04:40 -0400
committerJunio C Hamano <gitster@pobox.com>2008-03-18 22:18:57 -0700
commit1d0a694b8ace7b54256c8c40ca23939c8c9b49fd (patch)
treeb1db8f619f0c22c724935433d4015e19af8318c1 /t
parentef00d150e4f9959bf083adf92419b5053ba11584 (diff)
downloadgit-1d0a694b8ace7b54256c8c40ca23939c8c9b49fd.tar.gz
git-1d0a694b8ace7b54256c8c40ca23939c8c9b49fd.tar.xz
Fix t3200 config
"git-config name = value" doesn't do anything most of the time. The test meant "git-config name value", but that leaves the configuration such that later tests will be confused, so move it to the end. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3200-branch.sh20
1 files changed, 10 insertions, 10 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 38a90adad..cb5f7a444 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -153,16 +153,6 @@ test_expect_success 'test tracking setup via config' \
test $(git config branch.my3.remote) = local &&
test $(git config branch.my3.merge) = refs/heads/master'
-test_expect_success 'avoid ambiguous track' '
- git config branch.autosetupmerge true &&
- git config remote.ambi1.url = lalala &&
- git config remote.ambi1.fetch = refs/heads/lalala:refs/heads/master &&
- git config remote.ambi2.url = lilili &&
- git config remote.ambi2.fetch = refs/heads/lilili:refs/heads/master &&
- git branch all1 master &&
- test -z "$(git config branch.all1.merge)"
-'
-
test_expect_success 'test overriding tracking setup via --no-track' \
'git config branch.autosetupmerge true &&
git config remote.local.url . &&
@@ -224,4 +214,14 @@ test_expect_success \
test -f .git/logs/refs/heads/g/h/i &&
diff expect .git/logs/refs/heads/g/h/i'
+test_expect_success 'avoid ambiguous track' '
+ git config branch.autosetupmerge true &&
+ git config remote.ambi1.url lalala &&
+ git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
+ git config remote.ambi2.url lilili &&
+ git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
+ git branch all1 master &&
+ test -z "$(git config branch.all1.merge)"
+'
+
test_done