diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-21 07:28:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-21 07:28:07 -0700 |
| commit | 581412cb02cc79c566c9828a9cfbe7847b2c6df2 (patch) | |
| tree | c3239c5fa72512228b9f351ed8de0f2f6739c0e1 /t/t9114-git-svn-dcommit-merge.sh | |
| parent | fe87c92138d91e2002c46b06f8389814436de1cf (diff) | |
| parent | 36db1eddf972c88edf402b99e2366ad533635ab8 (diff) | |
| download | git-581412cb02cc79c566c9828a9cfbe7847b2c6df2.tar.gz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
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
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
| -rwxr-xr-x | t/t9114-git-svn-dcommit-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index 17b2855c4f..84f7c9b4bb 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -35,12 +35,12 @@ EOF } test_expect_success 'setup svn repository' ' - svn co "$svnrepo" mysvnwork && + svn_cmd co "$svnrepo" mysvnwork && mkdir -p mysvnwork/trunk && cd mysvnwork && big_text_block >> trunk/README && - svn add trunk && - svn ci -m "first commit" trunk && + svn_cmd add trunk && + svn_cmd ci -m "first commit" trunk && cd .. ' |