From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
"Frédéric Heitzmann" <frederic.heitzmann@gmail.com>,
"Michael J Gruber" <git@drmicha.warpmail.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 2/3] git: Remove handling for GIT_PREFIX
Date: Wed, 25 May 2011 20:37:13 -0700 [thread overview]
Message-ID: <1306381034-44190-2-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1306381034-44190-1-git-send-email-davvid@gmail.com>
handle_alias() no longer needs to set GIT_PREFIX since it is defined
in setup_git_directory_gently(). Remove the duplicated effort and use
run_command_v_opt() since there is no need to setup the environment.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
This patch is unchanged.
git.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/git.c b/git.c
index 89721d4..8828c18 100644
--- a/git.c
+++ b/git.c
@@ -183,8 +183,6 @@ static int handle_alias(int *argcp, const char ***argv)
if (alias_string[0] == '!') {
const char **alias_argv;
int argc = *argcp, i;
- struct strbuf sb = STRBUF_INIT;
- const char *env[2];
commit_pager_choice();
@@ -195,13 +193,7 @@ static int handle_alias(int *argcp, const char ***argv)
alias_argv[i] = (*argv)[i];
alias_argv[argc] = NULL;
- strbuf_addstr(&sb, "GIT_PREFIX=");
- if (subdir)
- strbuf_addstr(&sb, subdir);
- env[0] = sb.buf;
- env[1] = NULL;
- ret = run_command_v_opt_cd_env(alias_argv, RUN_USING_SHELL, NULL, env);
- strbuf_release(&sb);
+ ret = run_command_v_opt(alias_argv, RUN_USING_SHELL);
if (ret >= 0) /* normal exit */
exit(ret);
--
1.7.5.2.660.g9f46
next prev parent reply other threads:[~2011-05-26 3:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 3:37 [PATCH v2 1/3] setup: Provide GIT_PREFIX to built-ins David Aguilar
2011-05-26 3:37 ` David Aguilar [this message]
2011-05-26 3:37 ` [PATCH v2 3/3] git-mergetool--lib: Make vimdiff retain the current directory David Aguilar
2011-05-26 5:05 ` David Aguilar
2011-05-26 5:29 ` [PATCH] " David Aguilar
2011-05-26 6:21 ` [PATCH v4 3/3] " David Aguilar
2011-05-26 17:45 ` [PATCH v2 1/3] setup: Provide GIT_PREFIX to built-ins Junio C Hamano
2011-05-26 21:49 ` David Aguilar
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=1306381034-44190-2-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=avarab@gmail.com \
--cc=frederic.heitzmann@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).