t9114.2: Don't use --track option against "svn-remote"-tracking branches
authorJohan Herland <johan@herland.net>
Sun, 21 Apr 2013 21:52:04 +0000 (23:52 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Apr 2013 22:14:41 +0000 (15:14 -0700)
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 test uses --track against a "remotes/trunk" ref which does not belong
to any configured (git) remotes, but is instead created by "git svn fetch"
operating on an svn-remote. It does not make sense to use an svn-remote as
an upstream for a local branch, as a regular "git pull" from (or "git push"
to) it would obviously fail (instead you would need to use "git svn" to
communicate with this remote). Furthermore, the usage of --track in this
case is unnecessary, since the upstreaming config that would be created is
never used.

Simply removing --track fixes the issue without changing the expected
behavior of the test.

Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9114-git-svn-dcommit-merge.sh
index 3077851015879fc147ded9bb573d02c13967eec9..f524d2f383212c7d5fb02103cc08c3cdde2519fc 100755 (executable)
@@ -48,7 +48,7 @@ test_expect_success 'setup svn repository' '
 test_expect_success 'setup git mirror and merge' '
        git svn init "$svnrepo" -t tags -T trunk -b branches &&
        git svn fetch &&
-       git checkout --track -b svn remotes/trunk &&
+       git checkout -b svn remotes/trunk &&
        git checkout -b merge &&
        echo new file > new_file &&
        git add new_file &&