From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Apr 2009 06:01:10 +0000 (-0700)
Subject: Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1
X-Git-Tag: v1.6.2.3~5^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1f398ee772552ba9763d979cf66566e48acfa302?hp=-c

Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1

* js/maint-1.6.0-exec-path-env:
Propagate --exec-path setting to external commands via GIT_EXEC_PATH
---

1f398ee772552ba9763d979cf66566e48acfa302
diff --combined exec_cmd.c
index cdd35f9195,589059f026..351fec2e9e
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@@ -25,6 -25,10 +25,10 @@@ void git_set_argv0_path(const char *pat
  void git_set_argv_exec_path(const char *exec_path)
  {
  	argv_exec_path = exec_path;
+ 	/*
+ 	 * Propagate this setting to external programs.
+ 	 */
+ 	setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
  }
  
  
@@@ -59,7 -63,9 +63,7 @@@ static void add_path(struct strbuf *out
  void setup_path(void)
  {
  	const char *old_path = getenv("PATH");
 -	struct strbuf new_path;
 -
 -	strbuf_init(&new_path, 0);
 +	struct strbuf new_path = STRBUF_INIT;
  
  	add_path(&new_path, argv_exec_path);
  	add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));