scripts: Add placeholders for OPTIONS_SPEC

[git.git] / git.c

diff --git a/git.c b/git.c
index c7cabf5f348118f318d7c3abe55853b576869a98..4e10581101c26444da5c7c44a80219b11607705b 100644 (file)
--- a/git.c
+++ b/git.c
@@ -6,28 +6,6 @@
 const char git_usage_string[] =
        "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]";
 
-static void prepend_to_path(const char *dir, int len)
-{
-       const char *old_path = getenv("PATH");
-       char *path;
-       int path_len = len;
-
-       if (!old_path)
-               old_path = "/usr/local/bin:/usr/bin:/bin";
-
-       path_len = len + strlen(old_path) + 1;
-
-       path = xmalloc(path_len + 1);
-
-       memcpy(path, dir, len);
-       path[len] = ':';
-       memcpy(path + len + 1, old_path, path_len - len);
-
-       setenv("PATH", path, 1);
-
-       free(path);
-}
-
 static int handle_options(const char*** argv, int* argc, int* envchanged)
 {
        int handled = 0;
@@ -408,7 +386,7 @@ int main(int argc, const char **argv)
 {
        const char *cmd = argv[0] ? argv[0] : "git-help";
        char *slash = strrchr(cmd, '/');
-       const char *exec_path = NULL;
+       const char *cmd_path = NULL;
        int done_alias = 0;
 
        /*
@@ -418,10 +396,7 @@ int main(int argc, const char **argv)
         */
        if (slash) {
                *slash++ = 0;
-               if (*cmd == '/')
-                       exec_path = cmd;
-               else
-                       exec_path = xstrdup(make_absolute_path(cmd));
+               cmd_path = cmd;
                cmd = slash;
        }
 
@@ -458,16 +433,12 @@ int main(int argc, const char **argv)
        cmd = argv[0];
 
        /*
-        * We execute external git command via execv_git_cmd(),
-        * which looks at "--exec-path" option, GIT_EXEC_PATH
-        * environment, and $(gitexecdir) in Makefile while built,
-        * in this order.  For scripted commands, we prepend
-        * the value of the exec_path variable to the PATH.
+        * We use PATH to find git commands, but we prepend some higher
+        * precidence paths: the "--exec-path" option, the GIT_EXEC_PATH
+        * environment, and the $(gitexecdir) from the Makefile at build
+        * time.
         */
-       if (exec_path)
-               prepend_to_path(exec_path, strlen(exec_path));
-       exec_path = git_exec_path();
-       prepend_to_path(exec_path, strlen(exec_path));
+       setup_path(cmd_path);
 
        while (1) {
                /* See if it's an internal command */