summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:12 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:12 +0900
commit798b029da81b456077daa7cd7b1a1ed5956fc766 (patch)
treef798577a38a1f452ea4d7c5de4ce3d2fb4315f63
parentMerge branch 'sg/t5516-fixes' (diff)
parentt7005-editor: get rid of the SPACES_IN_FILENAMES prereq (diff)
downloadtgif-798b029da81b456077daa7cd7b1a1ed5956fc766.tar.xz
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
-rwxr-xr-xt/t7005-editor.sh12
1 files changed, 3 insertions, 9 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 29e5043b94..b2ca77b338 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -111,14 +111,8 @@ do
'
done
-if echo 'echo space > "$1"' > "e space.sh"
-then
- # FS supports spaces in filenames
- test_set_prereq SPACES_IN_FILENAMES
-fi
-
-test_expect_success SPACES_IN_FILENAMES 'editor with a space' '
-
+test_expect_success 'editor with a space' '
+ echo "echo space >\$1" >"e space.sh" &&
chmod a+x "e space.sh" &&
GIT_EDITOR="./e\ space.sh" git commit --amend &&
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
-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 commit --amend &&