contrib/completion: add smerge to the mergetool completion candidates

diff --git a/exec-cmd.c b/exec-cmd.c
index 3b0a039083a8d377325983272e4aa38ee1b5674c..7deeab30397cf2edbee622717acd94de87256c8e 100644 (file)
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -48,7 +48,7 @@ static const char *system_prefix(void)
            !(prefix = strip_path_suffix(executable_dirname, GIT_EXEC_PATH)) &&
            !(prefix = strip_path_suffix(executable_dirname, BINDIR)) &&
            !(prefix = strip_path_suffix(executable_dirname, "git"))) {
-               prefix = PREFIX;
+               prefix = FALLBACK_RUNTIME_PREFIX;
                trace_printf("RUNTIME_PREFIX requested, "
                                "but prefix computation failed.  "
                                "Using static fallback '%s'.\n", prefix);
@@ -209,6 +209,8 @@ static int git_get_exec_path(struct strbuf *buf, const char *argv0)
                return -1;
        }
 
+       trace2_cmd_path(buf->buf);
+
        return 0;
 }
 
@@ -243,7 +245,7 @@ void git_resolve_executable_dir(const char *argv0)
  */
 static const char *system_prefix(void)
 {
-       return PREFIX;
+       return FALLBACK_RUNTIME_PREFIX;
 }
 
 /*
@@ -358,7 +360,7 @@ int execl_git_cmd(const char *cmd, ...)
        }
        va_end(param);
        if (MAX_ARGS <= argc)
-               return error("too many args to run %s", cmd);
+               return error(_("too many args to run %s"), cmd);
 
        argv[argc] = NULL;
        return execv_git_cmd(argv);