git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 03/40] whitespace: remediate t1006-cat-file.sh
Date: Sat,  6 Aug 2011 18:44:17 +1000	[thread overview]
Message-ID: <1312620294-18616-3-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>

This file was edited by applying:

	 expand -i | unexpand --first-only | sed "s/ *$//"

to the file.

No change to test outputs or status code was observed.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 t/t1006-cat-file.sh |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index d8b7f2f..c78bf87 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -14,7 +14,7 @@ strlen () {
 
 maybe_remove_timestamp () {
     if test -z "$2"; then
-        echo_without_newline "$1"
+	echo_without_newline "$1"
     else
 	echo_without_newline "$(printf '%s\n' "$1" | sed -e 's/ [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$//')"
     fi
@@ -36,11 +36,11 @@ $content"
     '
 
     test_expect_success "Type of $type is correct" '
-        test $type = "$(git cat-file -t $sha1)"
+	test $type = "$(git cat-file -t $sha1)"
     '
 
     test_expect_success "Size of $type is correct" '
-        test $size = "$(git cat-file -s $sha1)"
+	test $size = "$(git cat-file -s $sha1)"
     '
 
     test -z "$content" ||
@@ -48,54 +48,54 @@ $content"
 	expect="$(maybe_remove_timestamp "$content" $no_ts)"
 	actual="$(maybe_remove_timestamp "$(git cat-file $type $sha1)" $no_ts)"
 
-        if test "z$expect" = "z$actual"
+	if test "z$expect" = "z$actual"
 	then
 		: happy
 	else
 		echo "Oops: expected $expect"
 		echo "but got $actual"
 		false
-        fi
+	fi
     '
 
     test_expect_success "Pretty content of $type is correct" '
 	expect="$(maybe_remove_timestamp "$pretty_content" $no_ts)"
 	actual="$(maybe_remove_timestamp "$(git cat-file -p $sha1)" $no_ts)"
-        if test "z$expect" = "z$actual"
+	if test "z$expect" = "z$actual"
 	then
 		: happy
 	else
 		echo "Oops: expected $expect"
 		echo "but got $actual"
 		false
-        fi
+	fi
     '
 
     test -z "$content" ||
     test_expect_success "--batch output of $type is correct" '
 	expect="$(maybe_remove_timestamp "$batch_output" $no_ts)"
 	actual="$(maybe_remove_timestamp "$(echo $sha1 | git cat-file --batch)" $no_ts)"
-        if test "z$expect" = "z$actual"
+	if test "z$expect" = "z$actual"
 	then
 		: happy
 	else
 		echo "Oops: expected $expect"
 		echo "but got $actual"
 		false
-        fi
+	fi
     '
 
     test_expect_success "--batch-check output of $type is correct" '
 	expect="$sha1 $type $size"
 	actual="$(echo_without_newline $sha1 | git cat-file --batch-check)"
-        if test "z$expect" = "z$actual"
+	if test "z$expect" = "z$actual"
 	then
 		: happy
 	else
 		echo "Oops: expected $expect"
 		echo "but got $actual"
 		false
-        fi
+	fi
     '
 }
 
@@ -184,7 +184,7 @@ test_expect_success "--batch-check for a non-existent hash" '
     test "0000000000000000000000000000000000000042 missing
 0000000000000000000000000000000000000084 missing" = \
     "$( ( echo 0000000000000000000000000000000000000042;
-         echo_without_newline 0000000000000000000000000000000000000084; ) \
+	 echo_without_newline 0000000000000000000000000000000000000084; ) \
        | git cat-file --batch-check)"
 '
 
@@ -193,7 +193,7 @@ test_expect_success "--batch for an existent and a non-existent hash" '
 $tag_content
 0000000000000000000000000000000000000000 missing" = \
     "$( ( echo $tag_sha1;
-         echo_without_newline 0000000000000000000000000000000000000000; ) \
+	 echo_without_newline 0000000000000000000000000000000000000000; ) \
        | git cat-file --batch)"
 '
 
-- 
1.7.6.362.gf0e6

  parent reply	other threads:[~2011-08-06  8:45 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-06  8:41 [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts Jon Seymour
2011-08-06  8:44 ` [PATCH 01/40] test-cleaner: automate whitespace cleaning " Jon Seymour
2011-08-06  8:44   ` [PATCH 02/40] whitespace: remediate t1001-read-tree-m-2way.sh Jon Seymour
2011-08-06  8:44   ` Jon Seymour [this message]
2011-08-06  9:28     ` [PATCH 03/40] whitespace: remediate t1006-cat-file.sh Jeff King
2011-08-06  9:47       ` Jon Seymour
2011-08-06 17:56       ` Junio C Hamano
2011-08-06 22:56         ` Jon Seymour
2011-08-06  8:44   ` [PATCH 04/40] whitespace: remediate t1300-repo-config.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 05/40] whitespace: remediate t1503-rev-parse-verify.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 06/40] whitespace: remediate t3040-subprojects-basic.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 07/40] whitespace: remediate t3200-branch.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 08/40] whitespace: remediate t3406-rebase-message.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 09/40] whitespace: remediate t4002-diff-basic.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 10/40] whitespace: remediate t4010-diff-pathspec.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 11/40] whitespace: remediate t5300-pack-object.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 12/40] whitespace: remediate t5301-sliding-window.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 13/40] whitespace: remediate t5302-pack-index.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 14/40] whitespace: remediate t5303-pack-corruption-resilience.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 15/40] whitespace: remediate t5400-send-pack.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 16/40] whitespace: remediate t5402-post-merge-hook.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 17/40] whitespace: remediate t5403-post-checkout-hook.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 18/40] whitespace: remediate t5510-fetch.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 19/40] whitespace: remediate t6002-rev-list-bisect.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 20/40] whitespace: remediate t6005-rev-list-count.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 21/40] whitespace: remediate t6030-bisect-porcelain.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 22/40] whitespace: remediate t7003-filter-branch.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 23/40] whitespace: remediate t7004-tag.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 24/40] whitespace: remediate t7403-submodule-sync.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 25/40] whitespace: remediate t7500-commit.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 26/40] whitespace: remediate t7810-grep.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 27/40] whitespace: remediate t9100-git-svn-basic.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 28/40] whitespace: remediate t9104-git-svn-follow-parent.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 29/40] whitespace: remediate t9107-git-svn-migrate.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 30/40] whitespace: remediate t9108-git-svn-glob.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 31/40] whitespace: remediate t9109-git-svn-multi-glob.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 32/40] whitespace: remediate t9110-git-svn-use-svm-props.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 33/40] whitespace: remediate t9118-git-svn-funky-branch-names.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 34/40] whitespace: remediate t9125-git-svn-multi-glob-branch-names.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 35/40] whitespace: remediate t9400-git-cvsserver-server.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 36/40] whitespace: remediate t9401-git-cvsserver-crlf.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 37/40] whitespace: remediate t9500-gitweb-standalone-no-errors.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 38/40] whitespace: remediate t9603-cvsimport-patchsets.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 39/40] whitespace: remediate t1000-read-tree-m-3way.sh Jon Seymour
2011-08-06  8:44   ` [PATCH 40/40] whitespace: remediate t6120-describe.sh Jon Seymour
2011-08-06  9:17   ` [PATCH 01/40] test-cleaner: automate whitespace cleaning of test scripts Jon Seymour
2011-08-06 15:48   ` [PATCH] whitespace: additional whitespace clean ups Jon Seymour
2011-08-06  9:03 ` [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts Jon Seymour
2011-08-06  9:20 ` Jeff King
2011-08-06  9:36   ` Jon Seymour
2011-08-06  9:26 ` [PATCH replacement for 01/40] test-cleaner: automate whitespace cleaning " Jon Seymour

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=1312620294-18616-3-git-send-email-jon.seymour@gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=git@vger.kernel.org \
    /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).