git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Jacob Keller <jacob.keller@gmail.com>,
	Christian Couder <christian.couder@gmail.com>
Subject: [PATCH v4 7/8] t4205: refactor %(trailers) tests
Date: Tue, 15 Aug 2017 06:24:39 -0400	[thread overview]
Message-ID: <20170815102439.gillxuv56pcn3p6z@sigill.intra.peff.net> (raw)
In-Reply-To: <20170815102254.knccmhgralfijwli@sigill.intra.peff.net>

We currently have one test for %(trailers). In preparation
for more, let's refactor a few bits:

  - move the commit creation to its own setup step so it can
    be reused by multiple tests

  - add a trailer with whitespace continuation (to confirm
    that it is left untouched)

  - fix the sample text which claims the placeholder is %bT.
    This was switched long ago to %(trailers)

  - replace one "cat" with an "echo" when generating the
    expected output. This saves a process (and sets a better
    pattern for future tests to follow).

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t4205-log-pretty-formats.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 18aa1b5889..83ea85eb45 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -539,25 +539,29 @@ cat >trailers <<EOF
 Signed-off-by: A U Thor <author@example.com>
 Acked-by: A U Thor <author@example.com>
 [ v2 updated patch description ]
-Signed-off-by: A U Thor <author@example.com>
+Signed-off-by: A U Thor
+  <author@example.com>
 EOF
 
-test_expect_success 'pretty format %(trailers) shows trailers' '
+test_expect_success 'set up trailer tests' '
 	echo "Some contents" >trailerfile &&
 	git add trailerfile &&
-	git commit -F - <<-EOF &&
+	git commit -F - <<-EOF
 	trailers: this commit message has trailers
 
 	This commit is a test commit with trailers at the end. We parse this
-	message and display the trailers using %bT
+	message and display the trailers using %(trailers).
 
 	$(cat trailers)
 	EOF
-	git log --no-walk --pretty="%(trailers)" >actual &&
-	cat >expect <<-EOF &&
-	$(cat trailers)
+'
 
-	EOF
+test_expect_success 'pretty format %(trailers) shows trailers' '
+	git log --no-walk --pretty="%(trailers)" >actual &&
+	{
+		cat trailers &&
+		echo
+	} >expect &&
 	test_cmp expect actual
 '
 
-- 
2.14.1.352.ge5efb0d3f3


  parent reply	other threads:[~2017-08-15 10:24 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-09 12:21 [PATCH 0/5] make interpret-trailers useful for parsing Jeff King
2017-08-09 12:22 ` [PATCH 1/5] trailer: put process_trailers() options into a struct Jeff King
2017-08-09 12:24 ` [PATCH 2/5] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-09 17:52   ` Stefan Beller
2017-08-09 17:55     ` Stefan Beller
2017-08-09 18:35   ` Jonathan Tan
2017-08-10  7:40     ` Jeff King
2017-08-09 12:24 ` [PATCH 3/5] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-09 18:18   ` Stefan Beller
2017-08-10  7:32     ` Jeff King
2017-08-10 17:27       ` Stefan Beller
2017-08-10 17:33         ` Jeff King
2017-08-10 17:38           ` Stefan Beller
2017-08-10 18:43           ` Junio C Hamano
2017-08-09 18:38   ` Jonathan Tan
2017-08-10  7:36     ` Jeff King
2017-08-09 12:25 ` [PATCH 4/5] interpret-trailers: add an option to normalize output Jeff King
2017-08-09 12:26 ` [PATCH 5/5] interpret-trailers: add --parse convenience option Jeff King
2017-08-09 18:20   ` Stefan Beller
2017-08-10  7:59     ` Jeff King
2017-08-09 17:19 ` [PATCH 0/5] make interpret-trailers useful for parsing Junio C Hamano
2017-08-10  7:04   ` Jacob Keller
2017-08-10  7:28     ` Jeff King
2017-08-10 18:42       ` Junio C Hamano
2017-08-13 19:03         ` Jacob Keller
2017-08-10  8:02 ` Jeff King
2017-08-10  8:03   ` [PATCH 1/5] trailer: put process_trailers() options into a struct Jeff King
2017-08-10  8:03   ` [PATCH 2/5] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-10  8:03   ` [PATCH 3/5] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-10  8:03   ` [PATCH 4/5] interpret-trailers: add an option to normalize output Jeff King
2017-08-10 18:35     ` Stefan Beller
2017-08-10 18:37       ` Jeff King
2017-08-10 19:39         ` Christian Couder
2017-08-10 19:42           ` Jeff King
2017-08-10 20:26             ` Christian Couder
2017-08-10 19:44           ` Stefan Beller
2017-08-10 21:06             ` Christian Couder
2017-08-10 21:10               ` Jeff King
2017-08-10 23:02                 ` Ramsay Jones
2017-08-10 23:10                   ` Jeff King
2017-08-10 23:36                     ` Ramsay Jones
2017-08-11  7:02                     ` Christian Couder
2017-08-11  9:06                       ` Jeff King
2017-08-11 19:02                         ` Christian Couder
2017-08-10  8:03   ` [PATCH 5/5] interpret-trailers: add --parse convenience option Jeff King
2017-08-10 18:03   ` [PATCH 0/5] make interpret-trailers useful for parsing Jeff King
2017-08-10 18:03     ` [PATCH v3 1/5] trailer: put process_trailers() options into a struct Jeff King
2017-08-10 18:04     ` [PATCH v3 2/5] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-10 18:28       ` Stefan Beller
2017-08-10 18:31         ` Jeff King
2017-08-10 18:49           ` Junio C Hamano
2017-08-10 18:04     ` [PATCH v3 3/5] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-10 18:04     ` [PATCH v3 4/5] interpret-trailers: add an option to normalize output Jeff King
2017-08-10 18:04     ` [PATCH v3 5/5] interpret-trailers: add --parse convenience option Jeff King
2017-08-10 18:35     ` [PATCH 0/5] make interpret-trailers useful for parsing Stefan Beller
2017-08-10 19:43       ` Junio C Hamano
2017-08-15 10:22     ` [PATCH v4 0/8] trailer parsing via interpret-trailers and %(trailers) Jeff King
2017-08-15 10:23       ` [PATCH v4 1/8] trailer: put process_trailers() options into a struct Jeff King
2017-08-15 10:23       ` [PATCH v4 2/8] interpret-trailers: add an option to show only the trailers Jeff King
2017-08-15 10:23       ` [PATCH v4 3/8] interpret-trailers: add an option to show only existing trailers Jeff King
2017-08-15 10:23       ` [PATCH v4 4/8] interpret-trailers: add an option to unfold values Jeff King
2017-08-15 10:23       ` [PATCH v4 5/8] interpret-trailers: add --parse convenience option Jeff King
2017-08-15 11:26         ` Martin Ågren
2017-08-16  8:20           ` Jeff King
2017-08-17 18:19             ` Martin Ågren
2017-08-15 10:23       ` [PATCH v4 6/8] pretty: move trailer formatting to trailer.c Jeff King
2017-08-15 10:24       ` Jeff King [this message]
2017-08-15 10:25       ` [PATCH v4 8/8] pretty: support normalization options for %(trailers) 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=20170815102439.gillxuv56pcn3p6z@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.keller@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).