Merge branch 'sg/t7005-spaces-in-filenames-cleanup'

Test update.

* sg/t7005-spaces-in-filenames-cleanup:
  t7005-editor: get rid of the SPACES_IN_FILENAMES prereq
This commit is contained in:
Junio C Hamano 2018-05-23 14:38:12 +09:00
commit 798b029da8

View File

@ -111,14 +111,8 @@ do
' '
done done
if echo 'echo space > "$1"' > "e space.sh" test_expect_success 'editor with a space' '
then echo "echo space >\$1" >"e space.sh" &&
# FS supports spaces in filenames
test_set_prereq SPACES_IN_FILENAMES
fi
test_expect_success SPACES_IN_FILENAMES 'editor with a space' '
chmod a+x "e space.sh" && chmod a+x "e space.sh" &&
GIT_EDITOR="./e\ space.sh" git commit --amend && GIT_EDITOR="./e\ space.sh" git commit --amend &&
test space = "$(git show -s --pretty=format:%s)" test space = "$(git show -s --pretty=format:%s)"
@ -126,7 +120,7 @@ test_expect_success SPACES_IN_FILENAMES 'editor with a space' '
' '
unset GIT_EDITOR unset GIT_EDITOR
test_expect_success SPACES_IN_FILENAMES 'core.editor with a space' ' test_expect_success 'core.editor with a space' '
git config core.editor \"./e\ space.sh\" && git config core.editor \"./e\ space.sh\" &&
git commit --amend && git commit --amend &&