From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org
Subject: [PATCH/RFC] alias: use run_command api to execute aliases
Date: Thu, 6 Jan 2011 20:13:07 +0100 [thread overview]
Message-ID: <1294341187-3956-1-git-send-email-kusmabite@gmail.com> (raw)
On Windows, system() executes with cmd.exe instead of /bin/sh. This
means that aliases currently has to be batch-scripts instead of
bourne-scripts. On top of that, cmd.exe does not handle single quotes,
which is what the code-path currently uses to handle arguments with
spaces.
To solve both problems in one go, use run_command_v_opt() to execute
the alias. It already does the right thing prepend "sh -c " to the
alias.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
This fixes issue 553 in the msysGit issue tracker.
git.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/git.c b/git.c
index 68334f6..5b0b9d8 100644
--- a/git.c
+++ b/git.c
@@ -177,19 +177,20 @@ static int handle_alias(int *argcp, const char ***argv)
alias_string = alias_lookup(alias_command);
if (alias_string) {
if (alias_string[0] == '!') {
+ const char **alias_argv;
+ int i;
+
commit_pager_choice();
- if (*argcp > 1) {
- struct strbuf buf;
-
- strbuf_init(&buf, PATH_MAX);
- strbuf_addstr(&buf, alias_string);
- sq_quote_argv(&buf, (*argv) + 1, PATH_MAX);
- free(alias_string);
- alias_string = buf.buf;
- }
- trace_printf("trace: alias to shell cmd: %s => %s\n",
- alias_command, alias_string + 1);
- ret = system(alias_string + 1);
+
+ /* build alias_argv */
+ alias_argv = malloc(sizeof(char *) * *argcp + 1);
+ alias_argv[0] = alias_string + 1;
+ for (i = 1; i < *argcp; ++i)
+ alias_argv[i] = (*argv)[i];
+ alias_argv[*argcp] = NULL;
+
+ ret = run_command_v_opt(alias_argv, RUN_USING_SHELL);
+
if (ret >= 0 && WIFEXITED(ret) &&
WEXITSTATUS(ret) != 127)
exit(WEXITSTATUS(ret));
--
1.7.3.3.585.g74f6e
next reply other threads:[~2011-01-06 19:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 19:13 Erik Faye-Lund [this message]
2011-01-06 19:41 ` [PATCH/RFC] alias: use run_command api to execute aliases Jonathan Nieder
2011-01-06 19:52 ` Erik Faye-Lund
2011-01-07 1:17 ` [msysGit] " Johannes Schindelin
2011-01-07 14:24 ` Erik Faye-Lund
2011-01-07 14:51 ` Johannes Schindelin
2011-01-07 19:21 ` Junio C Hamano
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=1294341187-3956-1-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=msysgit@googlegroups.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).