diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:34 -0700 |
commit | 612c3dfb06675bf65831a7eb8b51ecc57224f5ef (patch) | |
tree | 469b2b41af3ac67016fccdf2d0adf420dfb14dd4 /t/t9158-git-svn-mergeinfo.sh | |
parent | 3819fb9ab4c80e5fea3a7b31703a3884f47c8a83 (diff) | |
parent | a8a5d2511871caec259036af95d7dd6287d12925 (diff) | |
download | git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.tar.gz git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.tar.xz |
Merge branch 'ew/git-svn-http-tests'
Tests for "git svn" have been taught to reuse the lib-httpd test
infrastructure when testing the subversion integration that
interacts with subversion repositories served over the http://
protocol.
* ew/git-svn-http-tests:
git svn: migrate tests to use lib-httpd
t/t91*: do not say how to avoid the tests
Diffstat (limited to 't/t9158-git-svn-mergeinfo.sh')
-rwxr-xr-x | t/t9158-git-svn-mergeinfo.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh index 13f78f268..a875b4510 100755 --- a/t/t9158-git-svn-mergeinfo.sh +++ b/t/t9158-git-svn-mergeinfo.sh @@ -7,8 +7,6 @@ test_description='git svn mergeinfo propagation' . ./lib-git-svn.sh -say 'define NO_SVN_TESTS to skip git svn tests' - test_expect_success 'initialize source svn repo' ' svn_cmd mkdir -m x "$svnrepo"/trunk && svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && |