Merge branch 'master' into sb/opt-filename

* master: (654 commits)
  http-push.c::remove_locks(): fix use after free
  t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C
  post-receive-email: hooks.showrev: show how to include both web link and patch
  MinGW: Fix compiler warning in merge-recursive
  MinGW: Add a simple getpass()
  MinGW: use POSIX signature of waitpid()
  MinGW: the path separator to split GITPERLLIB is ';' on Win32
  MinGW: Scan for \r in addition to \n when reading shbang lines
  gitweb: Sanitize title attribute in format_subject_html
  Terminate argv with NULL before calling setup_revisions()
  doc/git-rebase.txt: remove mention of multiple strategies
  git-send-email: Handle quotes when parsing .mailrc files
  git-svn: add --authors-prog option
  git-svn: Set svn.authorsfile if it is passed to git svn clone
  git-svn: Correctly report max revision when following deleted paths
  git-svn: Fix for svn paths removed > log-window-size revisions ago
  git-svn testsuite: use standard configuration for Subversion tools
  grep: fix word-regexp colouring
  completion: use git rev-parse to detect bare repos
  Cope better with a _lot_ of packs
  ...

1 files changed, 16 insertions, 16 deletions

diff --git a/t/t9133-git-svn-nested-git-repo.sh b/t/t9133-git-svn-nested-git-repo.sh
index 893f57ef73..f3c30e63b7 100755
--- a/t/t9133-git-svn-nested-git-repo.sh
+++ b/t/t9133-git-svn-nested-git-repo.sh
@@ -7,19 +7,19 @@ test_description='git svn property tests'
 . ./lib-git-svn.sh
 
 test_expect_success 'setup repo with a git repo inside it' '
-	svn co "$svnrepo" s &&
+	svn_cmd co "$svnrepo" s &&
 	(
 		cd s &&
 		git init &&
 		test -f .git/HEAD &&
 		> .git/a &&
 		echo a > a &&
-		svn add .git a &&
-		svn commit -m "create a nested git repo" &&
-		svn up &&
+		svn_cmd add .git a &&
+		svn_cmd commit -m "create a nested git repo" &&
+		svn_cmd up &&
 		echo hi >> .git/a &&
-		svn commit -m "modify .git/a" &&
-		svn up
+		svn_cmd commit -m "modify .git/a" &&
+		svn_cmd up
 	)
 '
 
@@ -33,9 +33,9 @@ test_expect_success 'SVN-side change outside of .git' '
 	(
 		cd s &&
 		echo b >> a &&
-		svn commit -m "SVN-side change outside of .git" &&
-		svn up &&
-		svn log -v | fgrep "SVN-side change outside of .git"
+		svn_cmd commit -m "SVN-side change outside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | fgrep "SVN-side change outside of .git"
 	)
 '
 
@@ -56,10 +56,10 @@ test_expect_success 'SVN-side change inside of .git' '
 		git add a &&
 		git commit -m "add a inside an SVN repo" &&
 		git log &&
-		svn add --force .git &&
-		svn commit -m "SVN-side change inside of .git" &&
-		svn up &&
-		svn log -v | fgrep "SVN-side change inside of .git"
+		svn_cmd add --force .git &&
+		svn_cmd commit -m "SVN-side change inside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | fgrep "SVN-side change inside of .git"
 	)
 '
 
@@ -80,9 +80,9 @@ test_expect_success 'SVN-side change in and out of .git' '
 		echo c >> a &&
 		git add a &&
 		git commit -m "add a inside an SVN repo" &&
-		svn commit -m "SVN-side change in and out of .git" &&
-		svn up &&
-		svn log -v | fgrep "SVN-side change in and out of .git"
+		svn_cmd commit -m "SVN-side change in and out of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | fgrep "SVN-side change in and out of .git"
 	)
 '