{"thread":{"id":"12733","subject":"[PATCH] Fix t3200 config","startedAt":"2008-03-18T02:04:40Z","lastAt":"2008-03-18T02:04:40Z","messageCount":1,"participants":["Daniel Barkalow"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"72334","messageId":"alpine.LNX.1.00.0803172204240.19665@iabervon.org","threadId":"12733","inReplyTo":null,"subject":"[PATCH] Fix t3200 config","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-03-18T02:04:40Z","receivedAt":"2008-03-18T02:04:40Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"\"git-config name = value\" doesn't do anything most of the time. The\ntest meant \"git-config name value\", but that leaves the configuration\nsuch that later tests will be confused, so move it to the end.\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\n---\n t/t3200-branch.sh |   20 ++++++++++----------\n 1 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 38a90ad..cb5f7a4 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -153,16 +153,6 @@ test_expect_success 'test tracking setup via config' \\\n      test $(git config branch.my3.remote) = local &&\n      test $(git config branch.my3.merge) = refs/heads/master'\n \n-test_expect_success 'avoid ambiguous track' '\n-\tgit config branch.autosetupmerge true &&\n-\tgit config remote.ambi1.url = lalala &&\n-\tgit config remote.ambi1.fetch = refs/heads/lalala:refs/heads/master &&\n-\tgit config remote.ambi2.url = lilili &&\n-\tgit config remote.ambi2.fetch = refs/heads/lilili:refs/heads/master &&\n-\tgit branch all1 master &&\n-\ttest -z \"$(git config branch.all1.merge)\"\n-'\n-\n test_expect_success 'test overriding tracking setup via --no-track' \\\n     'git config branch.autosetupmerge true &&\n      git config remote.local.url . &&\n@@ -224,4 +214,14 @@ test_expect_success \\\n \t test -f .git/logs/refs/heads/g/h/i &&\n \t diff expect .git/logs/refs/heads/g/h/i'\n \n+test_expect_success 'avoid ambiguous track' '\n+\tgit config branch.autosetupmerge true &&\n+\tgit config remote.ambi1.url lalala &&\n+\tgit config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&\n+\tgit config remote.ambi2.url lilili &&\n+\tgit config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&\n+\tgit branch all1 master &&\n+\ttest -z \"$(git config branch.all1.merge)\"\n+'\n+\n test_done\n-- \n1.5.4.3.610.gea6cd\n"}]}