From: Johannes Sixt Date: Tue, 23 Feb 2010 11:42:56 +0000 (+0100) Subject: Print RUNTIME_PREFIX warning only when GIT_TRACE is set X-Git-Tag: v1.7.1-rc0~90^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa0945701e39cf099ca9c28f79e239359781e4f6;p=git.git Print RUNTIME_PREFIX warning only when GIT_TRACE is set When RUNTIME_PREFIX is enabled, the installation prefix is derived by trying a limited set of known locations where the git executable can reside. If none of these is found, a warning is emitted. When git is built in a directory that matches neither of these known names, the warning would always be emitted when the uninstalled executable is run. This is a problem on Windows, where gitk picks the uninstalled git when invoked from the build directory and gets confused by the warning. Print the warning only when GIT_TRACE is set. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/exec_cmd.c b/exec_cmd.c index 408e4e55e..b2c07c70c 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -28,7 +28,7 @@ const char *system_path(const char *path) !(prefix = strip_path_suffix(argv0_path, BINDIR)) && !(prefix = strip_path_suffix(argv0_path, "git"))) { prefix = PREFIX; - fprintf(stderr, "RUNTIME_PREFIX requested, " + trace_printf("RUNTIME_PREFIX requested, " "but prefix computation failed. " "Using static fallback '%s'.\n", prefix); }