t9114.2: Don't use --track option against "svn-remote"-tracking branches

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>

Johan Herland committed Apr 21, 2013 at 23:52 UTC 983b17d4bbedd426d4fdd8a95df4dcd292c1a695
1 file changed +1 -1
t/t9114-git-svn-dcommit-merge.sh
+1 -1
@@ -48,7 +48,7 @@ test_expect_success 'setup svn repository' '
48 test_expect_success 'setup git mirror and merge' '
49 git svn init "$svnrepo" -t tags -T trunk -b branches &&
50 git svn fetch &&
51 - git checkout --track -b svn remotes/trunk &&
51 + git checkout -b svn remotes/trunk &&
52 git checkout -b merge &&
53 echo new file > new_file &&
54 git add new_file &&