aboutsummaryrefslogtreecommitdiff
path: root/t/t9118-git-svn-funky-branch-names.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 14:48:34 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-08 14:48:34 -0700
commit612c3dfb06675bf65831a7eb8b51ecc57224f5ef (patch)
tree469b2b41af3ac67016fccdf2d0adf420dfb14dd4 /t/t9118-git-svn-funky-branch-names.sh
parent3819fb9ab4c80e5fea3a7b31703a3884f47c8a83 (diff)
parenta8a5d2511871caec259036af95d7dd6287d12925 (diff)
downloadgit-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/t9118-git-svn-funky-branch-names.sh')
-rwxr-xr-xt/t9118-git-svn-funky-branch-names.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index ecb1fed14..41a026637 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup svnrepo' '
"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
- start_httpd
+ maybe_start_httpd
'
# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".