git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Prohaska <prohaska@zib.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Johannes Sixt <johannes.sixt@telecom.at>,
	Steve Haslam <shaslam@lastminute.com>,
	Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 3/6] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack.
Date: Sat, 10 Jan 2009 14:50:49 +0100	[thread overview]
Message-ID: <1231595452-27698-3-git-send-email-prohaska@zib.de> (raw)
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

  reply	other threads:[~2009-01-10 13:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-10 13:50 [PATCH 1/6] Move computation of absolute paths from Makefile to runtime and compute prefix on the fly if RUNTIME_PREFIX set Steffen Prohaska
2009-01-10 13:50 ` [PATCH 2/6] Refactor git_set_argv0_path() to git_extract_argv0_path() Steffen Prohaska
2009-01-10 13:50   ` Steffen Prohaska [this message]
2009-01-10 13:50     ` [PATCH 4/6] Add calls to git_extract_argv0_path() in programs that call git_config_* Steffen Prohaska
2009-01-10 13:50       ` [PATCH 5/6] Modify setup_path() to only add git_exec_path() to PATH Steffen Prohaska
2009-01-10 13:50         ` [PATCH 6/6] Windows: Revert to default paths and convert them by RUNTIME_PREFIX Steffen Prohaska
2009-01-10 14:34     ` [PATCH 3/6] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack Johannes Schindelin
2009-01-10 15:55       ` Steffen Prohaska
2009-01-10 16:01       ` Steffen Prohaska
2009-01-10 20:36         ` Junio C Hamano
2009-01-11 10:04           ` Steffen Prohaska
2009-01-11 10:21             ` Junio C Hamano
2009-01-11 12:57               ` Steffen Prohaska
2009-01-13 19:36     ` Johannes Sixt
2009-01-13 19:37   ` [PATCH 2/6] Refactor git_set_argv0_path() to git_extract_argv0_path() Johannes Sixt
2009-01-13 19:43 ` [PATCH 1/6] Move computation of absolute paths from Makefile to runtime and compute prefix on the fly if RUNTIME_PREFIX set Johannes Sixt

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=1231595452-27698-3-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).