From: Jonathan Tan <jonathantanmy@google.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/5] interpret-trailers: add an option to show only existing trailers
Date: Wed, 9 Aug 2017 11:38:20 -0700 [thread overview]
Message-ID: <20170809113820.50cfb247@twelve2.svl.corp.google.com> (raw)
In-Reply-To: <20170809122439.fscozhyvxcx2oq2n@sigill.intra.peff.net>
On Wed, 9 Aug 2017 08:24:40 -0400
Jeff King <peff@peff.net> wrote:
> diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
> index e5b0718ef6..525fd53e5b 100755
> --- a/t/t7513-interpret-trailers.sh
> +++ b/t/t7513-interpret-trailers.sh
> @@ -1312,4 +1312,19 @@ test_expect_success 'only-trailers omits non-trailer in middle of block' '
> test_cmp expected actual
> '
>
> +test_expect_success 'only existing' '
> + cat >expected <<-\EOF &&
> + existing: existing-value
> + EOF
> + git interpret-trailers \
> + --only-trailers --only-existing >actual <<-\EOF &&
> + my subject
> +
> + my body
> +
> + existing: existing-value
> + EOF
> + test_cmp expected actual
Would it be worth asserting that the "sign" trailer is configured here
and would normally appear? Maybe through a grep on the output of "git
config".
> +'
> +
> test_done
> diff --git a/trailer.c b/trailer.c
> index a4ff99f98a..88f6efe523 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -991,9 +991,10 @@ void process_trailers(const char *file, struct process_trailer_options *opts,
> trailer_end = process_input_file(opts->only_trailers ? NULL : outfile,
> sb.buf, &head);
>
> - process_command_line_args(&arg_head, trailers);
> -
> - process_trailers_lists(&head, &arg_head);
> + if (!opts->only_existing) {
> + process_command_line_args(&arg_head, trailers);
> + process_trailers_lists(&head, &arg_head);
> + }
This is a bit confusing, but it is correct, since
process_command_line_args() processes both configured trailers and
command-line trailers.
Having said that, it might be worth declaring LIST_HEAD(arg_head) inside
the if block now.
next prev parent reply other threads:[~2017-08-09 18:38 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 [this message]
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 ` [PATCH v4 7/8] t4205: refactor %(trailers) tests Jeff King
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=20170809113820.50cfb247@twelve2.svl.corp.google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).