[PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH

From: Steffen Prohaska <prohaska@zib.de>
Date: Aug 17, 2008, 12:44 UTC
Message-ID: <1218977083-14526-7-git-send-email-prohaska@zib.de>
In-Reply-To: <1218977083-14526-6-git-send-email-prohaska@zib.de>

Searching git programs only in the highest-priority location is sufficient. If the user explicitly overrides the default location (by --exec-path or GIT_EXEC_PATH), we can safely expect that the required programs are there.

This change allows testing of executables built with RUNTIME_PREFIX. Calling system_path(GIT_EXEC_PATH) is avoided if a higher-priority location is provided, which is the case for the tests.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 exec_cmd.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/exec_cmd.c b/exec_cmd.c
index d84e9e9..63efe23 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -114,9 +114,7 @@ void setup_path(void)
 
 	strbuf_init(&new_path, 0);
 
-	add_path(&new_path, argv_exec_path);
-	add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
-	add_path(&new_path, system_path(GIT_EXEC_PATH));
+	add_path(&new_path, git_exec_path());
 	add_path(&new_path, argv0_path);
 
 	if (old_path)

-- 
1.6.0.rc3.22.g053fd