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

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

From
Steffen Prohaska <prohaska@zib.de>
Date
Jan 10, 2009, 13:50 UTC
Message-ID
<1231595452-27698-5-git-send-email-prohaska@zib.de>
In-Reply-To
<1231595452-27698-4-git-send-email-prohaska@zib.de>

Searching git programs only in the highest priority location is sufficient. It does not make sense that some of the required programs are located at the highest priority location but 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 could get mixed, which is likely to cause confusion.

If a user explicitly overrides the default location (by --exec-path or GIT_EXEC_PATH), we now expect that all the required programs are found there. Instead of adding the directories "argv_exec_path", "getenv(EXEC_PATH_ENVIRONMENT)", and "system_path(GIT_EXEC_PATH)" to PATH, we now rely on git_exec_path(), which implements the same order, but only returns the highest priority location to search for executables.

Accessing only the location with highest priority is also required for testing executables built with RUNTIME_PREFIX. The call to system_path() should be avoided if RUNTIME_PREFIX is set and the executable is not installed at its final destination. Because we test before installing, we want to avoid calling system_path() during tests. The modifications in this commit avoid calling system_path(GIT_EXEC_PATH) if a higher-priority location is provided, which is the case when running 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 576c9ae..ec38b0a 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -117,9 +117,7 @@ void setup_path(void)
 	const char *old_path = getenv("PATH");
 	struct strbuf new_path = STRBUF_INIT;
 
-	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.1.85.g32c5d
Previous: Steffen ProhaskaNext: Steffen Prohaska
Message 5 of 16 in “Move computation of absolute paths from Makefile to runtime and compute prefix on the fly if RUNTIME_PREFIX set”
  1. 1/6 Move computation of absolute paths from Makefile to runtime and compute prefix on the fly if RUNTIME_PREFIX setSteffen Prohaska, Jan 10, 2009
  2. 2/6 Refactor git_set_argv0_path() to git_extract_argv0_path()Steffen Prohaska, Jan 10, 2009
  3. 3/6 Glean libexec path from argv[0] for git-upload-pack and git-receive-pack.Steffen Prohaska, Jan 10, 2009
  4. 4/6 Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska, Jan 10, 2009
  5. 5/6 Modify setup_path() to only add git_exec_path() to PATHSteffen Prohaska, Jan 10, 2009
  6. 6/6 Windows: Revert to default paths and convert them by RUNTIME_PREFIXSteffen Prohaska, Jan 10, 2009
  7. Johannes SchindelinJan 10, 2009
  8. Steffen ProhaskaJan 10, 2009
  9. Steffen ProhaskaJan 10, 2009
  10. Junio C HamanoJan 10, 2009
  11. Steffen ProhaskaJan 11, 2009
  12. Junio C HamanoJan 11, 2009
  13. Steffen ProhaskaJan 11, 2009
  14. Johannes SixtJan 13, 2009
  15. Johannes SixtJan 13, 2009
  16. Johannes SixtJan 13, 2009

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.