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 2/8] interpret-trailers: add an option to show only the trailers
Date: Tue, 15 Aug 2017 06:23:21 -0400 [thread overview]
Message-ID: <20170815102321.xpa3ywfizykyq4tz@sigill.intra.peff.net> (raw)
In-Reply-To: <20170815102254.knccmhgralfijwli@sigill.intra.peff.net>
In theory it's easy for any reader who wants to parse
trailers to do so. But there are a lot of subtle corner
cases around what counts as a trailer, when the trailer
block begins and ends, etc. Since interpret-trailers already
has our parsing logic, let's let callers ask it to just
output the trailers.
They still have to parse the "key: value" lines, but at
least they can ignore all of the other corner cases.
Signed-off-by: Jeff King <peff@peff.net>
---
Documentation/git-interpret-trailers.txt | 3 +++
builtin/interpret-trailers.c | 1 +
t/t7513-interpret-trailers.sh | 39 ++++++++++++++++++++++++++++++++
trailer.c | 23 +++++++++++--------
trailer.h | 1 +
5 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 31cdeaecdf..295dffbd21 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -80,6 +80,9 @@ OPTIONS
trailer to the input messages. See the description of this
command.
+--only-trailers::
+ Output only the trailers, not any other parts of the input.
+
CONFIGURATION VARIABLES
-----------------------
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index bb0d7b937a..afb12c11bc 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -24,6 +24,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
+ OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")),
OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
N_("trailer(s) to add")),
OPT_END()
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 0c6f91c433..90d30037b7 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -1275,4 +1275,43 @@ test_expect_success 'with cut line' '
test_cmp expected actual
'
+test_expect_success 'only trailers' '
+ git config trailer.sign.command "echo config-value" &&
+ cat >expected <<-\EOF &&
+ existing: existing-value
+ sign: config-value
+ added: added-value
+ EOF
+ git interpret-trailers \
+ --trailer added:added-value \
+ --only-trailers >actual <<-\EOF &&
+ my subject
+
+ my body
+
+ existing: existing-value
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'only-trailers omits non-trailer in middle of block' '
+ git config trailer.sign.command "echo config-value" &&
+ cat >expected <<-\EOF &&
+ Signed-off-by: nobody <nobody@nowhere>
+ Signed-off-by: somebody <somebody@somewhere>
+ sign: config-value
+ EOF
+ git interpret-trailers --only-trailers >actual <<-\EOF &&
+ subject
+
+ it is important that the trailers below are signed-off-by
+ so that they meet the "25% trailers Git knows about" heuristic
+
+ Signed-off-by: nobody <nobody@nowhere>
+ this is not a trailer
+ Signed-off-by: somebody <somebody@somewhere>
+ EOF
+ test_cmp expected actual
+'
+
test_done
diff --git a/trailer.c b/trailer.c
index e21a0d1629..22146002e9 100644
--- a/trailer.c
+++ b/trailer.c
@@ -164,13 +164,15 @@ static void print_tok_val(FILE *outfile, const char *tok, const char *val)
fprintf(outfile, "%s%c %s\n", tok, separators[0], val);
}
-static void print_all(FILE *outfile, struct list_head *head, int trim_empty)
+static void print_all(FILE *outfile, struct list_head *head,
+ const struct process_trailer_options *opts)
{
struct list_head *pos;
struct trailer_item *item;
list_for_each(pos, head) {
item = list_entry(pos, struct trailer_item, list);
- if (!trim_empty || strlen(item->value) > 0)
+ if ((!opts->trim_empty || strlen(item->value) > 0) &&
+ (!opts->only_trailers || item->token))
print_tok_val(outfile, item->token, item->value);
}
}
@@ -887,7 +889,8 @@ static int ends_with_blank_line(const char *buf, size_t len)
static int process_input_file(FILE *outfile,
const char *str,
- struct list_head *head)
+ struct list_head *head,
+ const struct process_trailer_options *opts)
{
struct trailer_info info;
struct strbuf tok = STRBUF_INIT;
@@ -897,9 +900,10 @@ static int process_input_file(FILE *outfile,
trailer_info_get(&info, str);
/* Print lines before the trailers as is */
- fwrite(str, 1, info.trailer_start - str, outfile);
+ if (!opts->only_trailers)
+ fwrite(str, 1, info.trailer_start - str, outfile);
- if (!info.blank_line_before_trailer)
+ if (!opts->only_trailers && !info.blank_line_before_trailer)
fprintf(outfile, "\n");
for (i = 0; i < info.trailer_nr; i++) {
@@ -914,7 +918,7 @@ static int process_input_file(FILE *outfile,
add_trailer_item(head,
strbuf_detach(&tok, NULL),
strbuf_detach(&val, NULL));
- } else {
+ } else if (!opts->only_trailers) {
strbuf_addstr(&val, trailer);
strbuf_strip_suffix(&val, "\n");
add_trailer_item(head,
@@ -986,18 +990,19 @@ void process_trailers(const char *file,
outfile = create_in_place_tempfile(file);
/* Print the lines before the trailers */
- trailer_end = process_input_file(outfile, sb.buf, &head);
+ trailer_end = process_input_file(outfile, sb.buf, &head, opts);
process_command_line_args(&arg_head, trailers);
process_trailers_lists(&head, &arg_head);
- print_all(outfile, &head, opts->trim_empty);
+ print_all(outfile, &head, opts);
free_all(&head);
/* Print the lines after the trailers as is */
- fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
+ if (!opts->only_trailers)
+ fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
if (opts->in_place)
if (rename_tempfile(&trailers_tempfile, file))
diff --git a/trailer.h b/trailer.h
index 9da00bedec..3cf35ced00 100644
--- a/trailer.h
+++ b/trailer.h
@@ -25,6 +25,7 @@ struct trailer_info {
struct process_trailer_options {
int in_place;
int trim_empty;
+ int only_trailers;
};
#define PROCESS_TRAILER_OPTIONS_INIT {0}
--
2.14.1.352.ge5efb0d3f3
next prev parent reply other threads:[~2017-08-15 10:23 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 ` Jeff King [this message]
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=20170815102321.xpa3ywfizykyq4tz@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).