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>
Daniel Barkalow committed
Mar 17, 2008 at 22:04 UTC
1d0a694b8ace7b54256c8c40ca23939c8c9b49fd
1 file changed
+10
-10
t/t3200-branch.sh
+10
-10
@@ -153,16 +153,6 @@ test_expect_success 'test tracking setup via config' \
153
test $(git config branch.my3.remote) = local &&
154
test $(git config branch.my3.merge) = refs/heads/master'
155
156
-test_expect_success 'avoid ambiguous track' '
157
- git config branch.autosetupmerge true &&
158
- git config remote.ambi1.url = lalala &&
159
- git config remote.ambi1.fetch = refs/heads/lalala:refs/heads/master &&
160
- git config remote.ambi2.url = lilili &&
161
- git config remote.ambi2.fetch = refs/heads/lilili:refs/heads/master &&
162
- git branch all1 master &&
163
- test -z "$(git config branch.all1.merge)"
164
-'
165
-
156
test_expect_success 'test overriding tracking setup via --no-track' \
157
'git config branch.autosetupmerge true &&
158
git config remote.local.url . &&
@@ -224,4 +214,14 @@ test_expect_success \
214
test -f .git/logs/refs/heads/g/h/i &&
215
diff expect .git/logs/refs/heads/g/h/i'
216
217
+test_expect_success 'avoid ambiguous track' '
218
+ git config branch.autosetupmerge true &&
219
+ git config remote.ambi1.url lalala &&
220
+ git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
221
+ git config remote.ambi2.url lilili &&
222
+ git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
223
+ git branch all1 master &&
224
+ test -z "$(git config branch.all1.merge)"
225
+'
226
+
227
test_done