Merge branch 'js/test-with-ws-in-path'
Test fixes. * js/test-with-ws-in-path: t0302 & t3900: add forgotten quotes Allow the test suite to pass in a directory whose name contains spaces
This commit is contained in:
commit
d702d5c5bd
@ -37,7 +37,7 @@ helper_test store
|
||||
unset XDG_CONFIG_HOME
|
||||
|
||||
test_expect_success 'if custom xdg file exists, home and xdg files not created' '
|
||||
test_when_finished "rm -f $HOME/xdg/git/credentials" &&
|
||||
test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
|
||||
test -s "$HOME/xdg/git/credentials" &&
|
||||
test_path_is_missing "$HOME/.git-credentials" &&
|
||||
test_path_is_missing "$HOME/.config/git/credentials"
|
||||
|
@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because of NULs' '
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 invalid characters refused' '
|
||||
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
|
||||
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
|
||||
echo "UTF-8 characters" >F &&
|
||||
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
|
||||
>"$HOME/invalid" &&
|
||||
@ -49,7 +49,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 overlong sequences rejected' '
|
||||
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
|
||||
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
|
||||
rm -f "$HOME/stderr" "$HOME/invalid" &&
|
||||
echo "UTF-8 overlong" >F &&
|
||||
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
|
||||
@ -59,7 +59,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 non-characters refused' '
|
||||
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
|
||||
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
|
||||
echo "UTF-8 non-character 1" >F &&
|
||||
printf "Commit message\n\nNon-character:\364\217\277\276\n" \
|
||||
>"$HOME/invalid" &&
|
||||
@ -68,7 +68,7 @@ test_expect_success 'UTF-8 non-characters refused' '
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 non-characters refused' '
|
||||
test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
|
||||
test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
|
||||
echo "UTF-8 non-character 2." >F &&
|
||||
printf "Commit message\n\nNon-character:\357\267\220\n" \
|
||||
>"$HOME/invalid" &&
|
||||
|
@ -130,8 +130,8 @@ EOF
|
||||
test_expect_success 'commit message from template with whitespace issue' '
|
||||
echo "content galore" >>foo &&
|
||||
git add foo &&
|
||||
GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-whitespaced-content git commit \
|
||||
--template "$TEMPLATE" &&
|
||||
GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
|
||||
git commit --template "$TEMPLATE" &&
|
||||
commit_msg_is "commit message"
|
||||
'
|
||||
|
||||
|
@ -25,8 +25,8 @@ init_git () {
|
||||
git init &&
|
||||
#git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
|
||||
# let's reuse an existing dump file!?
|
||||
git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
|
||||
git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
|
||||
git remote add svnsim "testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump"
|
||||
git remote add svnfile "testsvn::file://$TEST_DIRECTORY/t9154/svn.dump"
|
||||
}
|
||||
|
||||
if test -e "$GIT_BUILD_DIR/git-remote-testsvn"
|
||||
|
@ -28,7 +28,7 @@ test_expect_success 'git-svn-HEAD is a real HEAD' '
|
||||
git rev-parse --verify refs/heads/git-svn-HEAD^0
|
||||
'
|
||||
|
||||
svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
|
||||
svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/g')
|
||||
|
||||
test_expect_success 'initialize old-style (v0) git svn layout' '
|
||||
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
|
||||
|
Loading…
Reference in New Issue
Block a user