提交 3b2eb186 编写于 作者: J Jeff King 提交者: Junio C Hamano

fix whitespace violations in test scripts

These violations are simply wrong, but were never caught
because whitespace policy checking is turned off in the test
scripts.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 8e7e6f39
...@@ -41,7 +41,7 @@ test_expect_success 'apply needs clean working directory' ' ...@@ -41,7 +41,7 @@ test_expect_success 'apply needs clean working directory' '
echo 4 > other-file && echo 4 > other-file &&
git add other-file && git add other-file &&
echo 5 > other-file && echo 5 > other-file &&
test_must_fail git stash apply test_must_fail git stash apply
' '
test_expect_success 'apply stashed changes' ' test_expect_success 'apply stashed changes' '
......
...@@ -98,7 +98,7 @@ test_expect_success 'extra headers' ' ...@@ -98,7 +98,7 @@ test_expect_success 'extra headers' '
sed -e "/^$/q" patch2 > hdrs2 && sed -e "/^$/q" patch2 > hdrs2 &&
grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 && grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 &&
grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2 grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2
' '
test_expect_success 'extra headers without newlines' ' test_expect_success 'extra headers without newlines' '
...@@ -109,7 +109,7 @@ test_expect_success 'extra headers without newlines' ' ...@@ -109,7 +109,7 @@ test_expect_success 'extra headers without newlines' '
sed -e "/^$/q" patch3 > hdrs3 && sed -e "/^$/q" patch3 > hdrs3 &&
grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 && grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 &&
grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3 grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3
' '
test_expect_success 'extra headers with multiple To:s' ' test_expect_success 'extra headers with multiple To:s' '
...@@ -170,7 +170,7 @@ test_expect_success 'thread cover-letter' ' ...@@ -170,7 +170,7 @@ test_expect_success 'thread cover-letter' '
git checkout side && git checkout side &&
git format-patch --cover-letter --thread -o patches/ master && git format-patch --cover-letter --thread -o patches/ master &&
FIRST_MID=$(grep "Message-Id:" patches/0000-* | sed "s/^[^<]*\(<[^>]*>\).*$/\1/") && FIRST_MID=$(grep "Message-Id:" patches/0000-* | sed "s/^[^<]*\(<[^>]*>\).*$/\1/") &&
for i in patches/0001-* patches/0002-* patches/0003-* for i in patches/0001-* patches/0002-* patches/0003-*
do do
grep "References: $FIRST_MID" $i && grep "References: $FIRST_MID" $i &&
grep "In-Reply-To: $FIRST_MID" $i || break grep "In-Reply-To: $FIRST_MID" $i || break
......
...@@ -110,7 +110,7 @@ test_expect_success 'am applies patch correctly' ' ...@@ -110,7 +110,7 @@ test_expect_success 'am applies patch correctly' '
GIT_AUTHOR_NAME="Another Thor" GIT_AUTHOR_NAME="Another Thor"
GIT_AUTHOR_EMAIL="a.thor@example.com" GIT_AUTHOR_EMAIL="a.thor@example.com"
GIT_COMMITTER_NAME="Co M Miter" GIT_COMMITTER_NAME="Co M Miter"
GIT_COMMITTER_EMAIL="c.miter@example.com" GIT_COMMITTER_EMAIL="c.miter@example.com"
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
......
...@@ -38,7 +38,7 @@ test_expect_success 'setup remote repository' ' ...@@ -38,7 +38,7 @@ test_expect_success 'setup remote repository' '
cd - && cd - &&
mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH
' '
test_expect_success 'clone remote repository' ' test_expect_success 'clone remote repository' '
cd "$ROOT_PATH" && cd "$ROOT_PATH" &&
git clone $HTTPD_URL/test_repo.git test_repo_clone git clone $HTTPD_URL/test_repo.git test_repo_clone
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册