diff options
| author | Johan Herland <johan@herland.net> | 2013-04-21 23:52:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 15:14:41 -0700 |
| commit | 9c9cd39a0c9bc1f14e9dfc29ad98475794dda6b8 (patch) | |
| tree | b951fb0e43c1034668f8295f7312e0f4a0e12fdb /t/t3200-branch.sh | |
| parent | fa83a33b22283e465aafdacc53ad0fddea55bdf4 (diff) | |
| download | git-9c9cd39a0c9bc1f14e9dfc29ad98475794dda6b8.tar.gz git-9c9cd39a0c9bc1f14e9dfc29ad98475794dda6b8.tar.xz | |
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>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index d969f0ecd..1bfdadc96 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -317,13 +317,13 @@ test_expect_success 'test tracking setup (non-wildcard, matching)' ' test $(git config branch.my4.merge) = refs/heads/master ' -test_expect_success 'test tracking setup (non-wildcard, not matching)' ' +test_expect_failure 'tracking setup fails on non-matching refspec' ' git config remote.local.url . && git config remote.local.fetch refs/heads/s:refs/remotes/local/s && (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track my5 local/master && - ! test "$(git config branch.my5.remote)" = local && - ! test "$(git config branch.my5.merge)" = refs/heads/master + test_must_fail git branch --track my5 local/master && + test_must_fail git config branch.my5.remote && + test_must_fail git config branch.my5.merge ' test_expect_success 'test tracking setup via config' ' |