[PATCHv3 6/8] t9114.2: Don't use --track option against "svn-remote"-tracking branches
- From
Johan Herland <johan@herland.net>
- Date
- Apr 21, 2013, 21:52 UTC
- Message-ID
- <1366581126-3880-7-git-send-email-johan@herland.net>
- In-Reply-To
- <1366581126-3880-1-git-send-email-johan@herland.net>
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> --- t/t9114-git-svn-dcommit-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index 3077851..f524d2f 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -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 &&
-- 1.8.1.3.704.g33f7d4f