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 12/14] trailer: set author and committer env variables
Date: Thu, 06 Feb 2014 16:20:52 -0800 [thread overview]
Message-ID: <xmqqzjm3vkm3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140206202004.325.20148.chriscool@tuxfamily.org> (Christian Couder's message of "Thu, 06 Feb 2014 21:20:01 +0100")
Christian Couder <chriscool@tuxfamily•org> writes:
> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
> ---
> trailer.c | 30 +++++++++++++++++++++++++++++-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/trailer.c b/trailer.c
> index 98187fc..b5de616 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -1,5 +1,6 @@
> #include "cache.h"
> #include "run-command.h"
> +#include "argv-array.h"
> /*
> * Copyright (c) 2013 Christian Couder <chriscool@tuxfamily•org>
> */
> @@ -433,14 +434,40 @@ static int read_from_command(struct child_process *cp, struct strbuf *buf)
> return 0;
> }
>
> +static void setup_ac_env(struct argv_array *env, const char *ac_name, const char *ac_mail, const char *(*read)(int))
> +{
> + if (!getenv(ac_name) || !getenv(ac_mail)) {
> + struct ident_split ident;
> + const char *namebuf, *mailbuf;
> + int namelen, maillen;
> + const char *ac_info = read(IDENT_NO_DATE);
This is far too confusing. Name it read_fn() or something.
> + if (split_ident_line(&ident, ac_info, strlen(ac_info)))
> + return;
> +
> + namelen = ident.name_end - ident.name_begin;
> + namebuf = ident.name_begin;
> +
> + maillen = ident.mail_end - ident.mail_begin;
> + mailbuf = ident.mail_begin;
> +
> + argv_array_pushf(env, "%s=%.*s", ac_name, namelen, namebuf);
> + argv_array_pushf(env, "%s=%.*s", ac_mail, maillen, mailbuf);
> + }
> +}
> +
> static const char *apply_command(const char *command, const char *arg)
> {
> + struct argv_array env = ARGV_ARRAY_INIT;
> struct strbuf cmd = STRBUF_INIT;
> struct strbuf buf = STRBUF_INIT;
> struct child_process cp;
> const char *argv[] = {NULL, NULL};
> const char *result = "";
>
> + setup_ac_env(&env, "GIT_AUTHOR_NAME", "GIT_AUTHOR_EMAIL", git_author_info);
> + setup_ac_env(&env, "GIT_COMMITTER_NAME", "GIT_COMMITTER_EMAIL", git_committer_info);
> +
> strbuf_addstr(&cmd, command);
> if (arg)
> strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
> @@ -448,7 +475,7 @@ static const char *apply_command(const char *command, const char *arg)
> argv[0] = cmd.buf;
> memset(&cp, 0, sizeof(cp));
> cp.argv = argv;
> - cp.env = local_repo_env;
> + cp.env = env.argv;
> cp.no_stdin = 1;
> cp.out = -1;
> cp.use_shell = 1;
> @@ -459,6 +486,7 @@ static const char *apply_command(const char *command, const char *arg)
> result = strbuf_detach(&buf, NULL);
>
> strbuf_release(&cmd);
> + argv_array_clear(&env);
> return result;
> }
next prev parent reply other threads:[~2014-02-07 0:21 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
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 [this message]
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=xmqqzjm3vkm3.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