[PATCH 3/6] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack.
- From
Steffen Prohaska <prohaska@zib.de>
- Date
- Jan 10, 2009, 13:50 UTC
- Message-ID
- <1231595452-27698-3-git-send-email-prohaska@zib.de>
- In-Reply-To
- <1231595452-27698-2-git-send-email-prohaska@zib.de>
From: Steve Haslam <shaslam@lastminute.com>
If the user specified the full path to git-upload-pack as the -u option to "git clone" when cloning a remote repository, and git was not on the default PATH on the remote machine, git-upload-pack was failing to exec git-pack-objects.
By making the argv[0] path (if any) available to setup_path(), this will allow finding the "git" executable in the same directory as "git-upload-pack". The default built in to exec_cmd.c is to look for "git" in the ".../libexec/git-core" directory, but it is not installed there (any longer).
Much the same applies to invoking git-receive-pack from a non-PATH location using the "--exec" argument to "git push".
[ spr: split Steve's original commit into two commits. ]
Signed-off-by: Steve Haslam <shaslam@lastminute.com> Signed-off-by: Steffen Prohaska <prohaska@zib.de> --- builtin-receive-pack.c | 3 +++ upload-pack.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c index db67c31..bbedcfe 100644 --- a/builtin-receive-pack.c +++ b/builtin-receive-pack.c @@ -579,6 +579,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) int i; char *dir = NULL; + if (argv[0] && *argv[0]) + git_extract_argv0_path(argv[0]); + argv++; for (i = 1; i < argc; i++) { const char *arg = *argv++; diff --git a/upload-pack.c b/upload-pack.c index e5adbc0..c469a60 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -616,6 +616,9 @@ int main(int argc, char **argv) int i; int strict = 0; + if (argv[0] && *argv[0]) + git_extract_argv0_path(argv[0]); + for (i = 1; i < argc; i++) { char *arg = argv[i];
-- 1.6.1.85.g32c5d