diff options
| author | Eygene Ryabinkin <rea-git@codelabs.ru> | 2009-05-08 12:06:16 +0400 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-05-21 00:31:07 -0700 |
| commit | da083d688e41f9a4328fab262f315f9e4fe52a32 (patch) | |
| tree | 87b69a088e62bd40755f5f5155ecdab29148f68c /t/t9102-git-svn-deep-rmdir.sh | |
| parent | 065b0702f748b50e69d67609ace2632ce04b79a1 (diff) | |
| download | git-da083d688e41f9a4328fab262f315f9e4fe52a32.tar.gz git-da083d688e41f9a4328fab262f315f9e4fe52a32.tar.xz | |
git-svn testsuite: use standard configuration for Subversion tools
I have tweaked configuration in my ~/.subversion directory, namely I am
running auto-properties and automatically adding '$Id$' expansion to
every file. This choke the last test named 'proplist' from
t9101-git-svn-props.sh, because one more property, svn:keywords is
automatically added.
I had just wrapped svn invocation with the svn_cmd that specifies empty
directory via --config-dir argument. Since the latter is the global
option, it should be recognized by all svn subcommands, so no
regressions will be introduced.
Now svn_cmd is used everywhere, not just in the failed test module: this
should guard us from the future clashes with user-defined configuration
tweaks.
Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9102-git-svn-deep-rmdir.sh')
| -rwxr-xr-x | t/t9102-git-svn-deep-rmdir.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh index e22321801..028fb19e0 100755 --- a/t/t9102-git-svn-deep-rmdir.sh +++ b/t/t9102-git-svn-deep-rmdir.sh @@ -9,7 +9,7 @@ test_expect_success 'initialize repo' ' mkdir -p deeply/nested/directory/number/2 && echo foo > deeply/nested/directory/number/1/file && echo foo > deeply/nested/directory/number/2/another && - svn import -m "import for git svn" . "$svnrepo" && + svn_cmd import -m "import for git svn" . "$svnrepo" && cd .. ' @@ -23,7 +23,7 @@ test_expect_success 'Try a commit on rmdir' ' git rm -f deeply/nested/directory/number/2/another && git commit -a -m "remove another" && git svn set-tree --rmdir HEAD && - svn ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1 + svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1 ' |