git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Lea Wiemann <lewiemann@gmail.com>, git@vger.kernel.org
Subject: [PATCH 1/4] fix whitespace violations in test scripts
Date: Sat, 14 Jun 2008 02:51:19 -0400	[thread overview]
Message-ID: <20080614065119.GA9006@sigill.intra.peff.net> (raw)
In-Reply-To: <20080614064857.GA8930@sigill.intra.peff.net>

These violations are simply wrong, but were never caught
because whitespace policy checking is turned off in the test
scripts.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t1502-rev-parse-parseopt.sh |    2 +-
 t/t3800-mktag.sh              |    2 +-
 t/t3903-stash.sh              |    2 +-
 t/t4014-format-patch.sh       |    6 +++---
 t/t4150-am.sh                 |    2 +-
 t/t5540-http-push.sh          |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index d24a47d..7cdd70a 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -5,7 +5,7 @@ test_description='test git rev-parse --parseopt'
 
 cat > expect.err <<EOF
 usage: some-command [options] <args>...
-    
+
     some-command does foo and bar!
 
     -h, --help            show the help
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index df1fd6f..3907e67 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -245,7 +245,7 @@ cat >tag.sig <<EOF
 object $head
 type commit
 tag mytag
-tagger T A Gger <tagger@example.com>  
+tagger T A Gger <tagger@example.com>
 
 EOF
 
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 2d3ee3b..54d99ed 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -41,7 +41,7 @@ test_expect_success 'apply needs clean working directory' '
 	echo 4 > other-file &&
 	git add other-file &&
 	echo 5 > other-file &&
- 	test_must_fail git stash apply
+	test_must_fail git stash apply
 '
 
 test_expect_success 'apply stashed changes' '
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 3583e68..7fe853c 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -98,7 +98,7 @@ test_expect_success 'extra headers' '
 	sed -e "/^$/q" patch2 > hdrs2 &&
 	grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 &&
 	grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2
-	
+
 '
 
 test_expect_success 'extra headers without newlines' '
@@ -109,7 +109,7 @@ test_expect_success 'extra headers without newlines' '
 	sed -e "/^$/q" patch3 > hdrs3 &&
 	grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 &&
 	grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3
-	
+
 '
 
 test_expect_success 'extra headers with multiple To:s' '
@@ -170,7 +170,7 @@ test_expect_success 'thread cover-letter' '
 	git checkout side &&
 	git format-patch --cover-letter --thread -o patches/ master &&
 	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
 	  grep "References: $FIRST_MID" $i &&
 	  grep "In-Reply-To: $FIRST_MID" $i || break
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 722ae96..bc98260 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -110,7 +110,7 @@ test_expect_success 'am applies patch correctly' '
 
 GIT_AUTHOR_NAME="Another Thor"
 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"
 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index 7372439..f15dd03 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -38,7 +38,7 @@ test_expect_success 'setup remote repository' '
 	cd - &&
 	mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH
 '
-	
+
 test_expect_success 'clone remote repository' '
 	cd "$ROOT_PATH" &&
 	git clone $HTTPD_URL/test_repo.git test_repo_clone
-- 
1.5.6.rc2.183.g04614

  reply	other threads:[~2008-06-14  6:52 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-12 22:35 [PATCH] t/.gitattributes: only ignore whitespace errors in test files Lea Wiemann
2008-06-13  6:06 ` Jeff King
2008-06-13  7:49   ` [PATCH v2] " Lea Wiemann
2008-06-13 10:00   ` [PATCH] " Junio C Hamano
2008-06-14  6:48     ` Jeff King
2008-06-14  6:51       ` Jeff King [this message]
2008-06-14  7:01         ` [PATCH 1/4] fix whitespace violations in test scripts Jeff King
2008-06-14  7:20         ` Junio C Hamano
2008-06-14  7:22           ` Jeff King
2008-06-14  7:25             ` [PATCH v2 1/5] " Jeff King
2008-06-14  7:26             ` [PATCH v2 2/5] mask necessary whitespace policy " Jeff King
2008-06-14  7:27             ` [PATCH v2 3/5] avoid whitespace on empty line in automatic usage message Jeff King
2008-06-14  7:27             ` [PATCH v2 4/5] avoid trailing whitespace in zero-change diffstat lines Jeff King
2008-06-14  7:28             ` [PATCH v2 5/5] enable whitespace checking of test scripts Jeff King
2008-06-14  6:54       ` [PATCH 2/4] mask necessary whitespace policy violations in " Jeff King
2008-06-14  6:56       ` [PATCH 3/4] avoid trailing whitespace in zero-change diffstat lines Jeff King
2008-06-14  7:22         ` Junio C Hamano
2008-06-14  7:30           ` Jeff King
2008-06-14  6:56       ` [PATCH 4/4] enable whitespace checking of test scripts Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080614065119.GA9006@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=lewiemann@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).