From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Eyvind Bernhardsen <eyvind-git-list@orakel•ntnu.no>,
Nicolas Pitre <nico@cam•org>,
Nguyen Thai Ngoc Duy <pclouds@gmail•com>, Jan Hudec <bulb@ucw•cz>,
git@vger•kernel.org
Subject: Re: [PATCH] transport.c: call dash-less form of receive-pack and upload-pack on remote
Date: Sat, 01 Dec 2007 11:30:11 -0800 [thread overview]
Message-ID: <7vzlwu43i4.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0712010959180.27959@racer.site> (Johannes Schindelin's message of "Sat, 1 Dec 2007 10:17:03 +0000 (GMT)")
Johannes Schindelin <Johannes.Schindelin@gmx•de> writes:
>> I only eyeball-tested it and looks Okay, but that does not assure us
>> much ;-). Is this change easy to test using local transport?
>
> Seems like it breaks down with git-shell. But then, I think that we just
> have to fix execv_git_cmd() to call builtins via "git" instead.
So in execv_git_cmd(), instead of doing the strbuf_addf(), we do
something like this (and drop your patch)?
---
exec_cmd.c | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/exec_cmd.c b/exec_cmd.c
index 2d0a758..2920335 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -65,32 +65,24 @@ void setup_path(const char *cmd_path)
int execv_git_cmd(const char **argv)
{
- struct strbuf cmd;
- const char *tmp;
-
- strbuf_init(&cmd, 0);
- strbuf_addf(&cmd, "git-%s", argv[0]);
-
- /*
- * argv[0] must be the git command, but the argv array
- * belongs to the caller, and may be reused in
- * subsequent loop iterations. Save argv[0] and
- * restore it on error.
- */
- tmp = argv[0];
- argv[0] = cmd.buf;
-
- trace_argv_printf(argv, -1, "trace: exec:");
+ int i;
+ const char **args;
+
+ for (i = 0; argv[i]; i++)
+ ;
+ args = xcalloc(i + 1, sizeof(*args));
+ for (i = 0; argv[i]; i++)
+ args[i+1] = argv[i];
+ args[0] = "git";
+ args[i+1] = NULL;
+ trace_argv_printf(args, -1, "trace: exec:");
/* execvp() can only ever return if it fails */
- execvp(cmd.buf, (char **)argv);
+ execvp(args[0], (char **)args);
trace_printf("trace: exec failed: %s\n", strerror(errno));
- argv[0] = tmp;
-
- strbuf_release(&cmd);
-
+ free(args);
return -1;
}
next prev parent reply other threads:[~2007-12-01 19:30 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-27 15:02 [PATCH RFC] Move all dashed form git commands to libexecdir Nguyễn Thái Ngọc Duy
2007-11-27 15:12 ` Johannes Schindelin
2007-11-27 15:25 ` Nicolas Pitre
2007-11-27 16:04 ` [PATCH] " Nguyễn Thái Ngoc Duy
2007-11-27 16:18 ` Johannes Schindelin
2007-11-28 0:07 ` Jan Hudec
2007-11-28 1:13 ` Junio C Hamano
2007-11-28 8:18 ` Jan Hudec
2007-11-28 8:36 ` Nguyen Thai Ngoc Duy
2007-11-28 23:14 ` Junio C Hamano
2007-11-28 23:40 ` Johannes Schindelin
2007-11-28 23:48 ` Junio C Hamano
2007-11-29 0:01 ` Johannes Schindelin
2007-11-29 0:59 ` A Large Angry SCM
2007-11-29 1:02 ` Junio C Hamano
2007-11-29 3:17 ` Nguyen Thai Ngoc Duy
2007-11-29 14:09 ` Nicolas Pitre
2007-11-29 22:36 ` Junio C Hamano
2007-11-30 7:32 ` Wincent Colaiuta
2007-11-30 11:28 ` Eyvind Bernhardsen
2007-11-30 12:08 ` [PATCH] transport.c: call dash-less form of receive-pack and upload-pack on remote Johannes Schindelin
2007-12-01 2:36 ` Junio C Hamano
2007-12-01 10:17 ` Johannes Schindelin
2007-12-01 19:30 ` Junio C Hamano [this message]
2007-12-01 23:03 ` Johannes Schindelin
2007-12-01 23:15 ` Johannes Schindelin
2007-12-02 1:57 ` Junio C Hamano
2007-12-02 2:52 ` [PATCH 0/3] Call builtin functions directly, was " Johannes Schindelin
2007-12-02 2:54 ` [PATCH 1/3] Introduce release_all_objects() Johannes Schindelin
2007-12-02 2:54 ` [PATCH 2/3] Include the objects needed for the builtin functions into libgit.a Johannes Schindelin
2007-12-02 2:55 ` [PATCH 3/3] Introduce execv_git_builtin() and use it Johannes Schindelin
2007-12-02 3:04 ` Johannes Schindelin
2007-12-02 3:16 ` [REPLACEMENT PATCH " Johannes Schindelin
2007-12-02 5:19 ` [PATCH 0/3] Call builtin functions directly, was Re: [PATCH] transport.c: call dash-less form of receive-pack and upload-pack on remote Junio C Hamano
2007-12-02 11:35 ` Johannes Schindelin
2007-11-30 12:19 ` [PATCH] Move all dashed form git commands to libexecdir Nguyen Thai Ngoc Duy
2007-11-30 13:35 ` Johannes Schindelin
2007-11-29 15:08 ` Jeff King
2007-11-29 20:05 ` Nguyen Thai Ngoc Duy
2007-11-29 21:14 ` Jeff King
2007-11-29 22:19 ` Johannes Schindelin
2007-11-29 23:14 ` Jeff King
2007-11-29 23:30 ` Linus Torvalds
2007-11-30 0:13 ` Junio C Hamano
2007-11-30 0:35 ` Jeff King
2007-11-30 0:49 ` Junio C Hamano
2007-11-30 0:58 ` Jeff King
2007-11-30 1:13 ` Nicolas Pitre
2007-11-30 1:17 ` Jeff King
2007-11-30 5:42 ` Steffen Prohaska
2007-11-30 7:18 ` Andreas Ericsson
2007-11-30 15:09 ` Jeff King
2007-11-30 20:01 ` Junio C Hamano
2007-11-30 21:25 ` Jeff King
2007-11-30 23:10 ` Johannes Schindelin
2007-12-02 15:02 ` Wincent Colaiuta
2007-12-02 16:39 ` Johannes Schindelin
2007-12-02 16:56 ` Pascal Obry
2007-12-02 17:23 ` Johannes Schindelin
2007-12-01 2:37 ` Junio C Hamano
2007-12-01 4:17 ` Jeff King
2007-11-30 2:29 ` Linus Torvalds
2007-11-30 2:55 ` Nicolas Pitre
2007-11-30 5:51 ` Steffen Prohaska
2007-11-30 15:12 ` Jeff King
2007-11-30 15:28 ` Santi Béjar
2007-11-30 15:29 ` Jeff King
2007-11-30 15:50 ` Linus Torvalds
2007-11-30 16:22 ` Jeff King
2007-11-30 18:28 ` Johannes Schindelin
2007-11-30 18:37 ` Jeff King
2007-11-30 23:05 ` Johannes Schindelin
2007-11-30 23:21 ` Jeff King
2007-11-30 23:38 ` Johannes Schindelin
[not found] ` <fcaeb9bf0711302234l32460a1fqbf9825fc8055f99d@mail.gmail.com>
2007-12-01 19:32 ` Junio C Hamano
2007-12-01 21:26 ` Jeff King
2007-12-02 5:50 ` Nguyen Thai Ngoc Duy
2007-11-30 0:52 ` Nicolas Pitre
2007-11-30 1:00 ` Jeff King
2007-11-30 1:19 ` Nicolas Pitre
2007-11-30 1:25 ` Jeff King
2007-11-30 1:33 ` Nicolas Pitre
2007-11-30 1:53 ` Jeff King
2007-11-30 2:23 ` A Large Angry SCM
2007-11-30 0:40 ` Nguyen Thai Ngoc Duy
2007-11-30 0:51 ` A Large Angry SCM
2007-11-30 0:54 ` Johannes Schindelin
2007-11-30 2:03 ` A Large Angry SCM
2007-11-30 1:01 ` Nicolas Pitre
2007-11-30 2:17 ` A Large Angry SCM
2007-11-30 2:27 ` Nicolas Pitre
2007-11-29 0:14 ` Jakub Narebski
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=7vzlwu43i4.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=bulb@ucw$(echo .)cz \
--cc=eyvind-git-list@orakel$(echo .)ntnu.no \
--cc=git@vger$(echo .)kernel.org \
--cc=nico@cam$(echo .)org \
--cc=pclouds@gmail$(echo .)com \
/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