mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
da083d688e
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>
31 lines
800 B
Bash
Executable file
31 lines
800 B
Bash
Executable file
#!/bin/sh
|
|
test_description='git svn rmdir'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'initialize repo' '
|
|
mkdir import &&
|
|
cd import &&
|
|
mkdir -p deeply/nested/directory/number/1 &&
|
|
mkdir -p deeply/nested/directory/number/2 &&
|
|
echo foo > deeply/nested/directory/number/1/file &&
|
|
echo foo > deeply/nested/directory/number/2/another &&
|
|
svn_cmd import -m "import for git svn" . "$svnrepo" &&
|
|
cd ..
|
|
'
|
|
|
|
test_expect_success 'mirror via git svn' '
|
|
git svn init "$svnrepo" &&
|
|
git svn fetch &&
|
|
git checkout -f -b test-rmdir ${remotes_git_svn}
|
|
'
|
|
|
|
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_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
|
|
'
|
|
|
|
|
|
test_done
|