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 /fetch-clone.c | |
parent | c884dd9a54fcde71ea125c86e6b6ab92acbbc7cf (diff) | |
download | git-77cb17e940c806a4cc811bfd66187277b729a1e7.tar.gz git-77cb17e940c806a4cc811bfd66187277b729a1e7.tar.xz |
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 'fetch-clone.c')
-rw-r--r-- | fetch-clone.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fetch-clone.c b/fetch-clone.c index f46fe6ecb..859f40094 100644 --- a/fetch-clone.c +++ b/fetch-clone.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "exec_cmd.h" #include <sys/wait.h> static int finish_pack(const char *pack_tmp_name, const char *me) @@ -27,8 +28,7 @@ static int finish_pack(const char *pack_tmp_name, const char *me) dup2(pipe_fd[1], 1); close(pipe_fd[0]); close(pipe_fd[1]); - execlp("git-index-pack","git-index-pack", - "-o", idx, pack_tmp_name, NULL); + execl_git_cmd("index-pack", "-o", idx, pack_tmp_name, NULL); error("cannot exec git-index-pack <%s> <%s>", idx, pack_tmp_name); exit(1); @@ -105,8 +105,7 @@ int receive_unpack_pack(int fd[2], const char *me, int quiet) dup2(fd[0], 0); close(fd[0]); close(fd[1]); - execlp("git-unpack-objects", "git-unpack-objects", - quiet ? "-q" : NULL, NULL); + execl_git_cmd("unpack-objects", quiet ? "-q" : NULL, NULL); die("git-unpack-objects exec failed"); } close(fd[0]); |