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:
@ -79,8 +79,8 @@ test_expect_success \
|
||||
|
||||
cat >editor <<\EOF
|
||||
#!/bin/sh
|
||||
sed -e "s/a file/an amend commit/g" < $1 > $1-
|
||||
mv $1- $1
|
||||
sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
|
||||
mv "$1-" "$1"
|
||||
EOF
|
||||
chmod 755 editor
|
||||
|
||||
@ -99,8 +99,8 @@ test_expect_success \
|
||||
|
||||
cat >editor <<\EOF
|
||||
#!/bin/sh
|
||||
sed -e "s/amend/older/g" < $1 > $1-
|
||||
mv $1- $1
|
||||
sed -e "s/amend/older/g" < "$1" > "$1-"
|
||||
mv "$1-" "$1"
|
||||
EOF
|
||||
chmod 755 editor
|
||||
|
||||
|
Reference in New Issue
Block a user