git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
	Jeff King <peff@peff.net>,
	git@vger.kernel.org
Subject: [PATCH 1/4] rev-parse test: modernize quoting and whitespace
Date: Tue, 3 Sep 2013 10:05:32 -0700	[thread overview]
Message-ID: <20130903170532.GB29921@google.com> (raw)
In-Reply-To: <20130903170419.GA29921@google.com>

From: Felipe Contreras <felipe.contreras@gmail.com>

Instead of cramming everything in one line, put the test body in an
indented block after the opening test_expect_success line and quote
and put the closing quote on a line by itself.

Use single-quote instead of double-quote to quote the test body
for more useful --verbose output.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 t/t6101-rev-parse-parents.sh | 74 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index e673c25..c47b869 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -17,21 +17,62 @@ hide_error save_tag start2 unique_commit "start2" tree
 save_tag two_parents unique_commit "next" tree -p second -p start2
 save_tag final unique_commit "final" tree -p two_parents
 
-test_expect_success 'start is valid' 'git rev-parse start | grep "^[0-9a-f]\{40\}$"'
-test_expect_success 'start^0' "test $(cat .git/refs/tags/start) = $(git rev-parse start^0)"
-test_expect_success 'start^1 not valid' "if git rev-parse --verify start^1; then false; else :; fi"
-test_expect_success 'second^1 = second^' "test $(git rev-parse second^1) = $(git rev-parse second^)"
-test_expect_success 'final^1^1^1' "test $(git rev-parse start) = $(git rev-parse final^1^1^1)"
-test_expect_success 'final^1^1^1 = final^^^' "test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)"
-test_expect_success 'final^1^2' "test $(git rev-parse start2) = $(git rev-parse final^1^2)"
-test_expect_success 'final^1^2 != final^1^1' "test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)"
-test_expect_success 'final^1^3 not valid' "if git rev-parse --verify final^1^3; then false; else :; fi"
-test_expect_success '--verify start2^1' 'test_must_fail git rev-parse --verify start2^1'
-test_expect_success '--verify start2^0' 'git rev-parse --verify start2^0'
-test_expect_success 'final^1^@ = final^1^1 final^1^2' "test \"$(git rev-parse final^1^@)\" = \"$(git rev-parse final^1^1 final^1^2)\""
-test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' "test \"$(git rev-parse final^1^\!)\" = \"$(git rev-parse final^1 ^final^1^1 ^final^1^2)\""
-
-test_expect_success 'repack for next test' 'git repack -a -d'
+test_expect_success 'start is valid' '
+	git rev-parse start | grep "^[0-9a-f]\{40\}$"
+'
+
+test_expect_success 'start^0' '
+	test $(cat .git/refs/tags/start) = $(git rev-parse start^0)
+'
+
+test_expect_success 'start^1 not valid' '
+	if git rev-parse --verify start^1; then false; else :; fi
+'
+
+test_expect_success 'second^1 = second^' '
+	test $(git rev-parse second^1) = $(git rev-parse second^)
+'
+
+test_expect_success 'final^1^1^1' '
+	test $(git rev-parse start) = $(git rev-parse final^1^1^1)
+'
+
+test_expect_success 'final^1^1^1 = final^^^' '
+	test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)
+'
+
+test_expect_success 'final^1^2' '
+	test $(git rev-parse start2) = $(git rev-parse final^1^2)
+'
+
+test_expect_success 'final^1^2 != final^1^1' '
+	test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
+'
+
+test_expect_success 'final^1^3 not valid' '
+	if git rev-parse --verify final^1^3; then false; else :; fi
+'
+
+test_expect_success '--verify start2^1' '
+	test_must_fail git rev-parse --verify start2^1
+'
+
+test_expect_success '--verify start2^0' '
+	git rev-parse --verify start2^0
+'
+
+test_expect_success 'final^1^@ = final^1^1 final^1^2' '
+	test "$(git rev-parse final^1^@)" = "$(git rev-parse final^1^1 final^1^2)"
+'
+
+test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
+	test "$(git rev-parse final^1^!)" = "$(git rev-parse final^1 ^final^1^1 ^final^1^2)"
+'
+
+test_expect_success 'repack for next test' '
+	git repack -a -d
+'
+
 test_expect_success 'short SHA-1 works' '
 	start=`git rev-parse --verify start` &&
 	echo $start &&
@@ -39,6 +80,7 @@ test_expect_success 'short SHA-1 works' '
 	echo $abbrv &&
 	abbrv=`git rev-parse --verify $abbrv` &&
 	echo $abbrv &&
-	test $start = $abbrv'
+	test $start = $abbrv
+'
 
 test_done
-- 
1.8.4

  reply	other threads:[~2013-09-03 17:05 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-02  6:30 [PATCH 0/4] t: rev-parse-parents: cleanups Felipe Contreras
2013-09-02  6:30 ` [PATCH 1/4] t: rev-parse-parents: fix style Felipe Contreras
2013-09-02  6:30 ` [PATCH 2/4] t: rev-parse-parents: fix weird ! notation Felipe Contreras
2013-09-02  6:30 ` [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions Felipe Contreras
2013-09-03  7:12   ` Jeff King
2013-09-03  7:51     ` SZEDER Gábor
2013-09-03  8:03       ` Jeff King
2013-09-03 10:45         ` Felipe Contreras
2013-09-03 11:10           ` SZEDER Gábor
2013-09-03 13:39             ` Felipe Contreras
2013-09-03 15:08               ` SZEDER Gábor
2013-09-03 17:04                 ` [PATCH 0/4] " Jonathan Nieder
2013-09-03 17:05                   ` Jonathan Nieder [this message]
2013-09-03 17:06                   ` [PATCH 2/4] rev-parse test: use test_must_fail, not "if <command>; then false; fi" Jonathan Nieder
2013-09-03 21:56                     ` Felipe Contreras
2013-09-03 17:07                   ` [PATCH 3/4] rev-parse test: use test_cmp instead of "test" builtin Jonathan Nieder
2013-09-03 20:01                     ` Junio C Hamano
2013-09-04  4:28                       ` Jonathan Nieder
2013-09-03 22:01                     ` Felipe Contreras
2013-09-03 17:11                   ` [PATCH 4/4] rev-parse test: use standard test functions for setup Jonathan Nieder
2013-09-03 17:15                     ` [PATCH v2 " Jonathan Nieder
2013-09-03 17:20                   ` [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions Jeff King
2013-09-03 21:53                   ` Felipe Contreras
2013-09-04 16:47                   ` Junio C Hamano
2013-09-04 17:13                     ` John Keeping
2013-09-04 17:38                       ` Junio C Hamano
2013-09-04 18:36                         ` Jeff King
2013-09-04 19:14                           ` Junio C Hamano
2013-09-08  3:11                           ` Felipe Contreras
2013-09-08  4:06                             ` Jeff King
2013-09-08  4:13                               ` Felipe Contreras
2013-09-08  4:14                                 ` Felipe Contreras
2013-09-08  4:26                                 ` Jeff King
2013-09-08  4:52                                   ` Felipe Contreras
2013-09-08  5:02                                     ` Jeff King
2013-09-08 23:25                                       ` Felipe Contreras
2013-09-08 23:45                                         ` Jeff King
2013-09-09  0:45                                           ` Felipe Contreras
2013-09-08 18:33                                   ` Junio C Hamano
2013-09-08 23:18                                     ` Felipe Contreras
2013-09-08  8:11                               ` Philip Oakley
2013-09-03 17:31               ` Junio C Hamano
2013-09-03 17:33                 ` Junio C Hamano
2013-09-03 21:52                 ` Felipe Contreras
2013-09-02  6:30 ` [PATCH 4/4] t: rev-parse-parents: simplify setup Felipe Contreras

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=20130903170532.GB29921@google.com \
    --to=jrnieder@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=szeder@ira.uka.de \
    /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).