diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-14 13:45:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-14 13:45:16 -0700 |
commit | 761adeb4dba3305d0810b5340a71783d29484fb0 (patch) | |
tree | 4fb32f9d426394e845354e00553988a0f63003a3 /t/t9115-git-svn-dcommit-funky-renames.sh | |
parent | 486d1a56443fb19770a7d1abe08f1f4e9e44534d (diff) | |
parent | 4a7aaccd83a4f9eca17ca936b7c297e01840f587 (diff) | |
download | git-761adeb4dba3305d0810b5340a71783d29484fb0.tar.gz |
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
Diffstat (limited to 't/t9115-git-svn-dcommit-funky-renames.sh')
-rwxr-xr-x | t/t9115-git-svn-dcommit-funky-renames.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh index 4acbcb0acd..f0fbd3aff7 100755 --- a/t/t9115-git-svn-dcommit-funky-renames.sh +++ b/t/t9115-git-svn-dcommit-funky-renames.sh @@ -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 |