From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v4 15/17] trailer: set author and committer env variables Date: Thu, 30 Jan 2014 07:49:18 +0100 Message-ID: <20140130064921.7504.90926.chriscool@tuxfamily.org> References: <20140130064217.7504.473.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johan Herland , Josh Triplett , Thomas Rast , Michael Haggerty , Eric Sunshine , Dan Carpenter , Greg Kroah-Hartman , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Jan 30 08:38:31 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W8mCi-0005JB-OB for gcvg-git-2@plane.gmane.org; Thu, 30 Jan 2014 08:38:29 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752803AbaA3HiQ (ORCPT ); Thu, 30 Jan 2014 02:38:16 -0500 Received: from [194.158.98.45] ([194.158.98.45]:37476 "EHLO mail-3y.bbox.fr" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752792AbaA3HiN (ORCPT ); Thu, 30 Jan 2014 02:38:13 -0500 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-3y.bbox.fr (Postfix) with ESMTP id E7D9855; Thu, 30 Jan 2014 08:37:51 +0100 (CET) X-git-sha1: 5cc64ee0372191073ef1dff93af9c49a8b4cfed4 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140130064217.7504.473.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Christian Couder --- trailer.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/trailer.c b/trailer.c index dc8908a..e29b7f2 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 */ @@ -414,14 +415,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); + + 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); @@ -429,7 +456,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; @@ -440,6 +467,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; } -- 1.8.5.2.201.gacc5987