Merge branch 'bd/tests'
* bd/tests: Rename the test trash directory to contain spaces. Fix tests breaking when checkout path contains shell metacharacters Don't use the 'export NAME=value' in the test scripts. lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters test-lib.sh: Fix some missing path quoting Use test_set_editor in t9001-send-email.sh test-lib.sh: Add a test_set_editor function to safely set $VISUAL git-send-email.perl: Handle shell metacharacters in $EDITOR properly config.c: Escape backslashes in section names properly git-rebase.sh: Fix --merge --abort failures when path contains whitespace Conflicts: t/t9115-git-svn-dcommit-funky-renames.sh
This commit is contained in:
@ -7,16 +7,16 @@ test_description='git-svn dcommit can commit renames of files with ugly names'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'load repository with strange names' "
|
||||
svnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump &&
|
||||
test_expect_success 'load repository with strange names' '
|
||||
svnadmin load -q "$rawsvnrepo" < ../t9115/funky-names.dump &&
|
||||
start_httpd gtk+
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'init and fetch repository' "
|
||||
git svn init $svnrepo &&
|
||||
test_expect_success 'init and fetch repository' '
|
||||
git svn init "$svnrepo" &&
|
||||
git svn fetch &&
|
||||
git reset --hard git-svn
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'create file in existing ugly and empty dir' '
|
||||
mkdir "#{bad_directory_name}" &&
|
||||
@ -59,28 +59,28 @@ test_expect_success 'add a file with plus signs' '
|
||||
git svn dcommit
|
||||
'
|
||||
|
||||
test_expect_success 'clone the repository to test rebase' "
|
||||
git svn clone $svnrepo test-rebase &&
|
||||
test_expect_success 'clone the repository to test rebase' '
|
||||
git svn clone "$svnrepo" test-rebase &&
|
||||
cd test-rebase &&
|
||||
echo test-rebase > test-rebase &&
|
||||
git add test-rebase &&
|
||||
git commit -m test-rebase &&
|
||||
cd ..
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'make a commit to test rebase' "
|
||||
test_expect_success 'make a commit to test rebase' '
|
||||
echo test-rebase-main > test-rebase-main &&
|
||||
git add test-rebase-main &&
|
||||
git commit -m test-rebase-main &&
|
||||
git svn dcommit
|
||||
"
|
||||
'
|
||||
|
||||
test_expect_success 'git-svn rebase works inside a fresh-cloned repository' "
|
||||
test_expect_success 'git-svn rebase works inside a fresh-cloned repository' '
|
||||
cd test-rebase &&
|
||||
git svn rebase &&
|
||||
test -e test-rebase-main &&
|
||||
test -e test-rebase
|
||||
"
|
||||
'
|
||||
|
||||
stop_httpd
|
||||
|
||||
|
Reference in New Issue
Block a user