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>
This commit is contained in:

committed by
Junio C Hamano

parent
c884dd9a54
commit
77cb17e940
@ -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));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user