From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jan 2018 22:32:55 +0000 (-0800)
Subject: Merge branch 'js/test-with-ws-in-path'
X-Git-Tag: v2.16.0-rc2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d702d5c5bd675d203a2ced2786bf82ef96b4ed2b?hp=-c

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

d702d5c5bd675d203a2ced2786bf82ef96b4ed2b
diff --combined t/t7500-commit.sh
index 5739d3ed23,ea009b488a..1d33c5feb3
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@@ -130,8 -130,8 +130,8 @@@ EO
  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"
  '
  
@@@ -329,27 -329,4 +329,27 @@@ test_expect_success 'invalid message op
  	test_must_fail git commit --fixup HEAD~1 -F log
  '
  
 +cat >expected-template <<EOF
 +
 +# Please enter the commit message for your changes. Lines starting
 +# with '#' will be ignored, and an empty message aborts the commit.
 +#
 +# Author:    A U Thor <author@example.com>
 +#
 +# On branch commit-template-check
 +# Changes to be committed:
 +#	new file:   commit-template-check
 +#
 +# Untracked files not listed
 +EOF
 +
 +test_expect_success 'new line found before status message in commit template' '
 +	git checkout -b commit-template-check &&
 +	git reset --hard HEAD &&
 +	touch commit-template-check &&
 +	git add commit-template-check &&
 +	GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
 +	test_i18ncmp expected-template editor-input
 +'
 +
  test_done