t3200.39: tracking setup should fail if there is no matching refspec.
We are formalizing a requirement that any remote-tracking branch to be used as an upstream (i.e. as an argument to --track), _must_ "belong" to a configured remote by being matched by the "dst" side of a fetch refspec. This patch encodes the new expected behavior of this test, and marks the test with "test_expect_failure" in anticipation of a following patch to introduce the new behavior. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johan Herland committed
Apr 21, 2013 at 23:52 UTC
9c9cd39a0c9bc1f14e9dfc29ad98475794dda6b8
1 file changed
+4
-4
t/t3200-branch.sh
+4
-4
@@ -317,13 +317,13 @@ test_expect_success 'test tracking setup (non-wildcard, matching)' '
317
test $(git config branch.my4.merge) = refs/heads/master
318
'
319
320
-test_expect_success 'test tracking setup (non-wildcard, not matching)' '
320
+test_expect_failure '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 &&
323
(git show-ref -q refs/remotes/local/master || git fetch local) &&
324
- git branch --track my5 local/master &&
325
- ! test "$(git config branch.my5.remote)" = local &&
326
- ! test "$(git config branch.my5.merge)" = refs/heads/master
324
+ test_must_fail git branch --track my5 local/master &&
325
+ test_must_fail git config branch.my5.remote &&
326
+ test_must_fail git config branch.my5.merge
327
'
328
329
test_expect_success 'test tracking setup via config' '