t3200: Minor fix when preparing for tracking failure

We're testing that trying to --track a ref that is not covered by any remote refspec should fail. For that, we want to have refs/remotes/local/master present, but we also want the remote.local.fetch refspec to NOT match refs/remotes/local/master (so that the tracking setup will fail, as intended). However, when doing "git fetch local" to ensure the existence of refs/remotes/local/master, we must not already have changed remote.local.fetch so as to cause refs/remotes/local/master not to be fetched. Therefore, set remote.local.fetch to refs/heads/*:refs/remotes/local/* BEFORE we fetch, and then reset it to refs/heads/s:refs/remotes/local/s AFTER we have fetched (but before we test --track). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johan Herland committed Sep 8, 2013 at 22:58 UTC 81f339dc3d7f4f1dcec01f8d74be922e882ffc82
1 file changed +2 -1
t/t3200-branch.sh
+2 -1
@@ -319,8 +319,9 @@ test_expect_success 'test tracking setup (non-wildcard, matching)' '
319
320 test_expect_success 'tracking setup fails on non-matching refspec' '
321 git config remote.local.url . &&
322 - git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
322 + git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
323 (git show-ref -q refs/remotes/local/master || git fetch local) &&
324 + git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
325 test_must_fail git branch --track my5 local/master &&
326 test_must_fail git config branch.my5.remote &&
327 test_must_fail git config branch.my5.merge