revision --simplify-merges: use decoration instead of commit->util field

diff --git a/exec_cmd.c b/exec_cmd.c
index 45f92eb164f5680c224b2f96f146912224e7b03d..ce6741eb682b59ad638c7bee6ca31e2fcd53f281 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -7,40 +7,6 @@ extern char **environ;
 static const char *argv_exec_path;
 static const char *argv0_path;
 
-static const char *builtin_exec_path(void)
-{
-#ifndef __MINGW32__
-       return GIT_EXEC_PATH;
-#else
-       int len;
-       char *p, *q, *sl;
-       static char *ep;
-       if (ep)
-               return ep;
-
-       len = strlen(_pgmptr);
-       if (len < 2)
-               return ep = ".";
-
-       p = ep = xmalloc(len+1);
-       q = _pgmptr;
-       sl = NULL;
-       /* copy program name, turn '\\' into '/', skip last part */
-       while ((*p = *q)) {
-               if (*q == '\\' || *q == '/') {
-                       *p = '/';
-                       sl = p;
-               }
-               p++, q++;
-       }
-       if (sl)
-               *sl = '\0';
-       else
-               ep[0] = '.', ep[1] = '\0';
-       return ep;
-#endif
-}
-
 const char *system_path(const char *path)
 {
        if (!is_absolute_path(path) && argv0_path) {
@@ -75,7 +41,7 @@ const char *git_exec_path(void)
                return env;
        }
 
-       return builtin_exec_path();
+       return system_path(GIT_EXEC_PATH);
 }
 
 static void add_path(struct strbuf *out, const char *path)
@@ -84,7 +50,7 @@ static void add_path(struct strbuf *out, const char *path)
                if (is_absolute_path(path))
                        strbuf_addstr(out, path);
                else
-                       strbuf_addstr(out, make_absolute_path(path));
+                       strbuf_addstr(out, make_nonrelative_path(path));
 
                strbuf_addch(out, PATH_SEP);
        }
@@ -99,7 +65,7 @@ void setup_path(void)
 
        add_path(&new_path, argv_exec_path);
        add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
-       add_path(&new_path, builtin_exec_path());
+       add_path(&new_path, system_path(GIT_EXEC_PATH));
        add_path(&new_path, argv0_path);
 
        if (old_path)
@@ -112,7 +78,7 @@ void setup_path(void)
        strbuf_release(&new_path);
 }
 
-int execv_git_cmd(const char **argv)
+const char **prepare_git_cmd(const char **argv)
 {
        int argc;
        const char **nargv;
@@ -125,6 +91,11 @@ int execv_git_cmd(const char **argv)
        for (argc = 0; argv[argc]; argc++)
                nargv[argc + 1] = argv[argc];
        nargv[argc + 1] = NULL;
+       return nargv;
+}
+
+int execv_git_cmd(const char **argv) {
+       const char **nargv = prepare_git_cmd(argv);
        trace_argv_printf(nargv, "trace: exec:");
 
        /* execvp() can only ever return if it fails */