From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 May 2008 20:45:16 +0000 (-0700)
Subject: Merge branch 'bd/tests'
X-Git-Tag: v1.5.6-rc0~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=761adeb4dba3305d0810b5340a71783d29484fb0;p=git.git

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
---

761adeb4dba3305d0810b5340a71783d29484fb0
diff --cc t/t9115-git-svn-dcommit-funky-renames.sh
index 4acbcb0ac,298445f7d..f0fbd3aff
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@@ -7,16 -7,16 +7,16 @@@ test_description='git-svn dcommit can c
  
  . ./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
 +	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}" &&
@@@ -49,39 -49,6 +49,39 @@@ test_expect_success 'rename pretty fil
  	git svn dcommit
  	'
  
 +test_expect_success 'add a file with plus signs' '
 +	echo .. > +_+ &&
 +	git update-index --add +_+ &&
 +	git commit -m plus &&
 +	mkdir gtk+ &&
 +	git mv +_+ gtk+/_+_ &&
 +	git commit -m plus_dir &&
 +	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
  
  test_done