[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    [PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH
From:       Steffen Prohaska <prohaska () zib ! de>
Date:       2008-08-17 12:44:42
Message-ID: 1218977083-14526-7-git-send-email-prohaska () zib ! de
[Download RAW message or body]

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]