From: Steffen Prohaska <prohaska@zib.de>
To: Johannes Sixt <johannes.sixt@telecom.at>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Steve Haslam <shaslam@lastminute.com>,
Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 4/7] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack.
Date: Sun, 17 Aug 2008 14:44:40 +0200 [thread overview]
Message-ID: <1218977083-14526-5-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <1218977083-14526-4-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>
---
receive-pack.c | 3 +++
upload-pack.c | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/receive-pack.c b/receive-pack.c
index d44c19e..3699b16 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -467,6 +467,9 @@ int main(int argc, char **argv)
int i;
char *dir = NULL;
+ if (argv[0] && *argv[0])
+ git_extract_argv0_path(argv[0]);
+
argv++;
for (i = 1; i < argc; i++) {
char *arg = *argv++;
diff --git a/upload-pack.c b/upload-pack.c
index c911e70..086eff6 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.0.rc3.22.g053fd
next prev parent reply other threads:[~2008-08-17 12:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-17 12:44 [PATCH 0/7] prefix discovery at runtime (on Windows) Steffen Prohaska
2008-08-17 12:44 ` [PATCH 1/7] Windows: Add workaround for MSYS' path conversion Steffen Prohaska
2008-08-17 12:44 ` [PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set Steffen Prohaska
2008-08-17 12:44 ` [PATCH 3/7] Refactor git_set_argv0_path() to git_extract_argv0_path() Steffen Prohaska
2008-08-17 12:44 ` Steffen Prohaska [this message]
2008-08-17 12:44 ` [PATCH 5/7] Add calls to git_extract_argv0_path() in programs that call git_config_* Steffen Prohaska
2008-08-17 12:44 ` [PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH Steffen Prohaska
2008-08-17 12:44 ` [PATCH 7/7] Windows: Revert to default paths and convert them by RUNTIME_PREFIX Steffen Prohaska
2008-08-17 20:28 ` [PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH Johannes Sixt
2008-08-17 20:43 ` [PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set Johannes Sixt
2008-08-18 5:28 ` Steffen Prohaska
2008-08-17 20:35 ` [PATCH 1/7] Windows: Add workaround for MSYS' path conversion Johannes Sixt
2008-09-21 7:48 ` Steffen Prohaska
2008-08-17 18:01 ` [PATCH 0/7] prefix discovery at runtime (on Windows) Junio C Hamano
2008-09-08 22:50 ` Junio C Hamano
2008-09-09 14:49 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2008-09-21 16:24 [PATCH 0/7 v2] " Steffen Prohaska
2008-09-21 16:24 ` [PATCH 1/7] Windows: Add workaround for MSYS' path conversion Steffen Prohaska
2008-09-21 16:24 ` [PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set Steffen Prohaska
2008-09-21 16:24 ` [PATCH 3/7] Refactor git_set_argv0_path() to git_extract_argv0_path() Steffen Prohaska
2008-09-21 16:24 ` [PATCH 4/7] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack Steffen Prohaska
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=1218977083-14526-5-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.sixt@telecom.at \
--cc=shaslam@lastminute.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).