diff options
| author | Michal Ostrowski <mostrows@watson.ibm.com> | 2006-01-10 21:12:17 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-13 16:49:01 -0800 |
| commit | 77cb17e940c806a4cc811bfd66187277b729a1e7 (patch) | |
| tree | aae0b04758379c89b2dd2d02dd44c97b4d33998f /send-pack.c | |
| parent | c884dd9a54fcde71ea125c86e6b6ab92acbbc7cf (diff) | |
| download | git-77cb17e940c806a4cc811bfd66187277b729a1e7.tar.gz | |
Exec git programs without using PATH.
The git suite may not be in PATH (and thus programs such as
git-send-pack could not exec git-rev-list). Thus there is a need for
logic that will locate these programs. Modifying PATH is not
desirable as it result in behavior differing from the user's
intentions, as we may end up prepending "/usr/bin" to PATH.
- git C programs will use exec*_git_cmd() APIs to exec sub-commands.
- exec*_git_cmd() will execute a git program by searching for it in
the following directories:
1. --exec-path (as used by "git")
2. The GIT_EXEC_PATH environment variable.
3. $(gitexecdir) as set in Makefile (default value $(bindir)).
- git wrapper will modify PATH as before to enable shell scripts to
invoke "git-foo" commands.
Ideally, shell scripts should use the git wrapper to become independent
of PATH, and then modifying PATH will not be necessary.
[jc: with minor updates after a brief review.]
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/send-pack.c b/send-pack.c index cd36193444..990be3f1a3 100644 --- a/send-pack.c +++ b/send-pack.c @@ -3,6 +3,7 @@ #include "tag.h" #include "refs.h" #include "pkt-line.h" +#include "exec_cmd.h" static const char send_pack_usage[] = "git-send-pack [--all] [--exec=git-receive-pack] <remote> [<head>...]\n" @@ -26,11 +27,11 @@ static int is_zero_sha1(const unsigned char *sha1) static void exec_pack_objects(void) { static char *args[] = { - "git-pack-objects", + "pack-objects", "--stdout", NULL }; - execvp("git-pack-objects", args); + execv_git_cmd(args); die("git-pack-objects exec failed (%s)", strerror(errno)); } @@ -39,7 +40,7 @@ static void exec_rev_list(struct ref *refs) static char *args[1000]; int i = 0; - args[i++] = "git-rev-list"; /* 0 */ + args[i++] = "rev-list"; /* 0 */ args[i++] = "--objects"; /* 1 */ while (refs) { char *buf = malloc(100); @@ -58,7 +59,7 @@ static void exec_rev_list(struct ref *refs) refs = refs->next; } args[i] = NULL; - execvp("git-rev-list", args); + execv_git_cmd(args); die("git-rev-list exec failed (%s)", strerror(errno)); } |