git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Prohaska <prohaska@zib.de>
To: Johannes Sixt <johannes.sixt@telecom.at>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH
Date: Sun, 17 Aug 2008 14:44:42 +0200	[thread overview]
Message-ID: <1218977083-14526-7-git-send-email-prohaska@zib.de> (raw)
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

  reply	other threads:[~2008-08-17 12:47 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-17 12:44 [PATCH 0/7] prefix discovery at runtime (on Windows) Steffen Prohaska
2008-08-17 12:44 ` [PATCH 1/7] Windows: Add workaround for MSYS' path conversion Steffen Prohaska
2008-08-17 12:44   ` [PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set Steffen Prohaska
2008-08-17 12:44     ` [PATCH 3/7] Refactor git_set_argv0_path() to git_extract_argv0_path() Steffen Prohaska
2008-08-17 12:44       ` [PATCH 4/7] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack Steffen Prohaska
2008-08-17 12:44         ` [PATCH 5/7] Add calls to git_extract_argv0_path() in programs that call git_config_* Steffen Prohaska
2008-08-17 12:44           ` Steffen Prohaska [this message]
2008-08-17 12:44             ` [PATCH 7/7] Windows: Revert to default paths and convert them by RUNTIME_PREFIX Steffen Prohaska
2008-08-17 20:28             ` [PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH Johannes Sixt
2008-08-17 20:43     ` [PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set Johannes Sixt
2008-08-18  5:28       ` Steffen Prohaska
2008-08-17 20:35   ` [PATCH 1/7] Windows: Add workaround for MSYS' path conversion Johannes Sixt
2008-09-21  7:48     ` Steffen Prohaska
2008-08-17 18:01 ` [PATCH 0/7] prefix discovery at runtime (on Windows) Junio C Hamano
2008-09-08 22:50   ` Junio C Hamano
2008-09-09 14:49     ` Johannes Schindelin
  -- strict thread matches above, loose matches on Subject: below --
2008-09-21 16:24 [PATCH 0/7 v2] " Steffen Prohaska
2008-09-21 16:24 ` [PATCH 1/7] Windows: Add workaround for MSYS' path conversion Steffen Prohaska
2008-09-21 16:24   ` [PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set Steffen Prohaska
2008-09-21 16:24     ` [PATCH 3/7] Refactor git_set_argv0_path() to git_extract_argv0_path() Steffen Prohaska
2008-09-21 16:24       ` [PATCH 4/7] Glean libexec path from argv[0] for git-upload-pack and git-receive-pack Steffen Prohaska
2008-09-21 16:24         ` [PATCH 5/7] Add calls to git_extract_argv0_path() in programs that call git_config_* Steffen Prohaska
2008-09-21 16:24           ` [PATCH 6/7] Modify setup_path() to only add git_exec_path() to PATH Steffen Prohaska

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1218977083-14526-7-git-send-email-prohaska@zib.de \
    --to=prohaska@zib.de \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.sixt@telecom.at \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).