git-cvsimport: force checkout of working tree after initial import

[git.git] / exec_cmd.c

diff --git a/exec_cmd.c b/exec_cmd.c
index 12eb36494ca467169aff4db35335b3fdadd4cbee..9b74ed2f42ad9a452f5a1d9ab55d5ca1e1de2594 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -1,10 +1,11 @@
 #include "cache.h"
 #include "exec_cmd.h"
+#include "quote.h"
 #define MAX_ARGS       32
 
 extern char **environ;
 static const char *builtin_exec_path = GIT_EXEC_PATH;
-static const char *current_exec_path = NULL;
+static const char *current_exec_path;
 
 void git_set_exec_path(const char *exec_path)
 {
@@ -20,8 +21,8 @@ const char *git_exec_path(void)
        if (current_exec_path)
                return current_exec_path;
 
-       env = getenv("GIT_EXEC_PATH");
-       if (env) {
+       env = getenv(EXEC_PATH_ENVIRONMENT);
+       if (env && *env) {
                return env;
        }
 
@@ -34,7 +35,7 @@ int execv_git_cmd(const char **argv)
        char git_command[PATH_MAX + 1];
        int i;
        const char *paths[] = { current_exec_path,
-                               getenv("GIT_EXEC_PATH"),
+                               getenv(EXEC_PATH_ENVIRONMENT),
                                builtin_exec_path };
 
        for (i = 0; i < ARRAY_SIZE(paths); ++i) {
@@ -43,7 +44,7 @@ int execv_git_cmd(const char **argv)
                const char *exec_dir = paths[i];
                const char *tmp;
 
-               if (!exec_dir) continue;
+               if (!exec_dir || !*exec_dir) continue;
 
                if (*exec_dir != '/') {
                        if (!getcwd(git_command, sizeof(git_command))) {
@@ -55,7 +56,7 @@ int execv_git_cmd(const char **argv)
                        len = strlen(git_command);
 
                        /* Trivial cleanup */
-                       while (!strncmp(exec_dir, "./", 2)) {
+                       while (!prefixcmp(exec_dir, "./")) {
                                exec_dir += 2;
                                while (*exec_dir == '/')
                                        exec_dir++;
@@ -96,9 +97,13 @@ int execv_git_cmd(const char **argv)
                tmp = argv[0];
                argv[0] = git_command;
 
+               trace_argv_printf(argv, -1, "trace: exec:");
+
                /* execve() can only ever return if it fails */
                execve(git_command, (char **)argv, environ);
 
+               trace_printf("trace: exec failed: %s\n", strerror(errno));
+
                argv[0] = tmp;
        }
        return -1;