git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 10/17] trailer: if no input file is passed, read from stdin

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Feb 2, 2014, 09:50 UTC
Message-ID
<CAPig+cTVN+MqjhouCsE2gi4GWd14dLH6=5QrbEfTTgz5jLxtKA@mail.gmail.com>
In-Reply-To
<20140130064921.7504.57934.chriscool@tuxfamily.org>

On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder <chriscool@tuxfamily.org> wrote:

Show 20 quoted lines
> It is simpler and more natural if the "git interpret-trailers"
> is made a filter as its output already goes to sdtout.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> diff --git a/trailer.c b/trailer.c
> index 8681aed..73a65e0 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -464,8 +464,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)
strbuf_fread(), perhaps?
Show 20 quoted lines
> +                       die_errno(_("could not read from stdin"));
> +       }
>
>         return strbuf_split(&sb, '\n');
>  }
> @@ -530,10 +535,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);
>
> --
> 1.8.5.2.201.gacc5987
Previous: Christian CouderNext: Christian Couder
Message 21 of 33 in “Add interpret-trailers builtin”
  1. 00/17 Add interpret-trailers builtinChristian Couder, Jan 30, 2014
  2. 01/17 Add data structures and basic functions for commit trailersChristian Couder, Jan 30, 2014
  3. Eric SunshineJan 30, 2014
  4. 02/17 trailer: process trailers from file and argumentsChristian Couder, Jan 30, 2014
  5. Eric SunshineJan 31, 2014
  6. 03/17 trailer: read and process config informationChristian Couder, Jan 30, 2014
  7. Eric SunshineJan 31, 2014
  8. 04/17 trailer: process command line trailer argumentsChristian Couder, Jan 30, 2014
  9. Eric SunshineJan 31, 2014
  10. 05/17 strbuf: add strbuf_isspace()Christian Couder, Jan 30, 2014
  11. Eric SunshineJan 31, 2014
  12. Eric SunshineJan 31, 2014
  13. 06/17 trailer: parse trailers from input fileChristian Couder, Jan 30, 2014
  14. Eric SunshineJan 31, 2014
  15. 07/17 trailer: put all the processing together and printChristian Couder, Jan 30, 2014
  16. 08/17 trailer: add interpret-trailers commandChristian Couder, Jan 30, 2014
  17. Eric SunshineJan 31, 2014
  18. Christian CouderFeb 6, 2014
  19. 09/17 trailer: add tests for "git interpret-trailers"Christian Couder, Jan 30, 2014
  20. 10/17 trailer: if no input file is passed, read from stdinChristian Couder, Jan 30, 2014
  21. Eric SunshineFeb 2, 2014
  22. Christian CouderFeb 6, 2014
  23. Junio C HamanoFeb 6, 2014
  24. Christian CouderFeb 9, 2014
  25. 11/17 trailer: add new_trailer_item() functionChristian Couder, Jan 30, 2014
  26. Eric SunshineFeb 2, 2014
  27. 12/17 strbuf: add strbuf_replace()Christian Couder, Jan 30, 2014
  28. Eric SunshineJan 31, 2014
  29. 13/17 trailer: execute command from 'trailer.<name>.command'Christian Couder, Jan 30, 2014
  30. 14/17 trailer: add tests for trailer commandChristian Couder, Jan 30, 2014
  31. 15/17 trailer: set author and committer env variablesChristian Couder, Jan 30, 2014
  32. 16/17 trailer: add tests for commands using env variablesChristian Couder, Jan 30, 2014
  33. 17/17 Documentation: add documentation for 'git interpret-trailers'Christian Couder, Jan 30, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.