git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Steffen Prohaska <prohaska@zib.de>
Date
Sep 21, 2008, 16:24 UTC
Message-ID
<1222014278-11071-7-git-send-email-prohaska@zib.de>
In-Reply-To
<1222014278-11071-6-git-send-email-prohaska@zib.de>

We should search git programs only in the highest-priority location. The old code added the directories "argv_exec_path", "getenv(EXEC_PATH_ENVIRONMENT)", and "system_path(GIT_EXEC_PATH)" to PATH. The same order is implemented in git_exec_path(), which returns the highest priority location to search for executables. If the user explicitly overrides the default location (by --exec-path or GIT_EXEC_PATH) we can expect that all the required programs are there. It does not make sense that only some of the required programs are located at the highest priority location and other programs are picked up from a lower priority exec-path. If exec-path is overridden a complete set of commands should be provided, otherwise several different versions might easily get mixed, which is likely to spread confusion.

Accessing the location with highest priority only is also required for 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. The call to system_path() must be avoided, if RUNTIME_PREFIX is set, because the call would fail if the executable is not installed at its final destination. But we test before installing.

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 46ebf7e..2a86670 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -111,9 +111,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.2.GIT
Previous: Steffen ProhaskaNext: Steffen Prohaska
Message 7 of 11 in “prefix discovery at runtime (on Windows)”
  1. 0/7 prefix discovery at runtime (on Windows)Steffen Prohaska, Sep 21, 2008
  2. 1/7 Windows: Add workaround for MSYS' path conversionSteffen Prohaska, Sep 21, 2008
  3. 2/7 system_path(): Add prefix computation at runtime if RUNTIME_PREFIX setSteffen Prohaska, Sep 21, 2008
  4. 3/7 Refactor git_set_argv0_path() to git_extract_argv0_path()Steffen Prohaska, Sep 21, 2008
  5. 4/7 Glean libexec path from argv[0] for git-upload-pack and git-receive-pack.Steffen Prohaska, Sep 21, 2008
  6. 5/7 Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska, Sep 21, 2008
  7. 6/7 Modify setup_path() to only add git_exec_path() to PATHSteffen Prohaska, Sep 21, 2008
  8. 7/7 Windows: Revert to default paths and convert them by RUNTIME_PREFIXSteffen Prohaska, Sep 21, 2008
  9. Johannes SixtSep 21, 2008
  10. Steffen ProhaskaSep 22, 2008
  11. Johannes SixtSep 21, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.