From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <chriscool@tuxfamily•org>
Cc: git@vger•kernel.org, Johan Herland <johan@herland•net>,
Josh Triplett <josh@joshtriplett•org>,
Thomas Rast <tr@thomasrast•ch>,
Michael Haggerty <mhagger@alum•mit.edu>,
Eric Sunshine <sunshine@sunshineco•com>,
Dan Carpenter <dan.carpenter@oracle•com>,
Greg Kroah-Hartman <greg@kroah•com>, Jeff King <peff@peff•net>
Subject: Re: [PATCH v5 09/14] trailer: if no input file is passed, read from stdin
Date: Thu, 06 Feb 2014 16:12:53 -0800 [thread overview]
Message-ID: <xmqqa9e3wzju.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140206202004.325.76199.chriscool@tuxfamily.org> (Christian Couder's message of "Thu, 06 Feb 2014 21:19:58 +0100")
Christian Couder <chriscool@tuxfamily•org> writes:
> It is simpler and more natural if the "git interpret-trailers"
> is made a filter as its output already goes to sdtout.
sdtout?
Why isn't this a pure filter without any "infile" parameter in the
first place?
> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
> ---
> builtin/interpret-trailers.c | 2 +-
> t/t7513-interpret-trailers.sh | 7 +++++++
> trailer.c | 15 +++++++++------
> 3 files changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
> index 04b0ae2..ae8e561 100644
> --- a/builtin/interpret-trailers.c
> +++ b/builtin/interpret-trailers.c
> @@ -23,7 +23,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
>
> struct option options[] = {
> OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
> - OPT_FILENAME(0, "infile", &infile, N_("use message from file")),
> + OPT_FILENAME(0, "infile", &infile, N_("use message from file, instead of stdin")),
> OPT_END()
> };
>
> diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
> index 8be333c..f5ef81f 100755
> --- a/t/t7513-interpret-trailers.sh
> +++ b/t/t7513-interpret-trailers.sh
> @@ -205,4 +205,11 @@ test_expect_success 'using "ifMissing = doNothing"' '
> test_cmp expected actual
> '
>
> +test_expect_success 'with input from stdin' '
> + cat complex_message_body >expected &&
> + printf "Bug #42\nFixes: \nAcked-by= \nAcked-by= Junio\nAcked-by= Peff\nReviewed-by: \nSigned-off-by: \n" >>expected &&
> + git interpret-trailers "review:" "fix=53" "cc=Linus" "ack: Junio" "fix=22" "bug: 42" "ack: Peff" < complex_message >actual &&
> + test_cmp expected actual
> +'
> +
> test_done
> diff --git a/trailer.c b/trailer.c
> index 186316f..108e104 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -483,8 +483,13 @@ static struct strbuf **read_input_file(const char *infile)
> {
> struct strbuf sb = STRBUF_INIT;
>
> - if (strbuf_read_file(&sb, infile, 0) < 0)
> - die_errno(_("could not read input file '%s'"), infile);
> + if (infile) {
> + if (strbuf_read_file(&sb, infile, 0) < 0)
> + die_errno(_("could not read input file '%s'"), infile);
> + } else {
> + if (strbuf_read(&sb, fileno(stdin), 0) < 0)
> + die_errno(_("could not read from stdin"));
> + }
>
> return strbuf_split(&sb, '\n');
> }
> @@ -551,10 +556,8 @@ void process_trailers(const char *infile, int trim_empty, int argc, const char *
>
> git_config(git_trailer_config, NULL);
>
> - /* Print the non trailer part of infile */
> - if (infile) {
> - process_input_file(infile, &infile_tok_first, &infile_tok_last);
> - }
> + /* Print the non trailer part of infile (or stdin if infile is NULL) */
> + process_input_file(infile, &infile_tok_first, &infile_tok_last);
>
> arg_tok_first = process_command_line_args(argc, argv);
next prev parent reply other threads:[~2014-02-07 0:13 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-06 20:19 [PATCH v5 00/14] Add interpret-trailers builtin Christian Couder
2014-02-06 20:19 ` [PATCH v5 01/14] Add data structures and basic functions for commit trailers Christian Couder
2014-02-06 23:44 ` Junio C Hamano
2014-02-09 13:48 ` Christian Couder
2014-02-10 7:27 ` Eric Sunshine
2014-02-06 23:46 ` Junio C Hamano
2014-02-09 13:51 ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 02/14] trailer: process trailers from file and arguments Christian Couder
2014-02-07 0:03 ` Junio C Hamano
2014-02-09 13:52 ` Christian Couder
2014-02-10 18:14 ` Junio C Hamano
2014-02-10 19:59 ` Christian Couder
2014-02-10 20:51 ` Junio C Hamano
2014-02-11 15:02 ` Christian Couder
2014-02-11 18:07 ` Junio C Hamano
2014-02-14 21:41 ` Christian Couder
2014-02-14 21:46 ` Junio C Hamano
2014-02-14 23:29 ` Christian Couder
2014-02-14 23:39 ` Junio C Hamano
2014-02-14 23:57 ` Junio C Hamano
2014-02-15 0:16 ` Junio C Hamano
2014-02-21 0:22 ` Junio C Hamano
2014-02-23 10:44 ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 03/14] trailer: read and process config information Christian Couder
2014-02-06 20:19 ` [PATCH v5 04/14] trailer: process command line trailer arguments Christian Couder
2014-02-07 0:08 ` Junio C Hamano
2014-02-09 14:06 ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 05/14] trailer: parse trailers from input file Christian Couder
2014-02-06 20:19 ` [PATCH v5 06/14] trailer: put all the processing together and print Christian Couder
2014-02-06 20:19 ` [PATCH v5 07/14] trailer: add interpret-trailers command Christian Couder
2014-02-07 0:10 ` Junio C Hamano
2014-02-07 8:34 ` Christian Couder
2014-02-07 18:09 ` Junio C Hamano
2014-02-07 20:35 ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 08/14] trailer: add tests for "git interpret-trailers" Christian Couder
2014-02-07 0:11 ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 09/14] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-07 0:12 ` Junio C Hamano [this message]
2014-02-06 20:19 ` [PATCH v5 10/14] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-02-07 0:18 ` Junio C Hamano
2014-02-07 18:17 ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 11/14] trailer: add tests for trailer command Christian Couder
2014-02-06 20:20 ` [PATCH v5 12/14] trailer: set author and committer env variables Christian Couder
2014-02-07 0:20 ` Junio C Hamano
2014-02-07 0:26 ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 13/14] trailer: add tests for commands using " Christian Couder
2014-02-06 20:20 ` [PATCH v5 14/14] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-02-10 7:17 ` Eric Sunshine
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=xmqqa9e3wzju.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=dan.carpenter@oracle$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=greg@kroah$(echo .)com \
--cc=johan@herland$(echo .)net \
--cc=josh@joshtriplett$(echo .)org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tr@thomasrast$(echo .)ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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