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

gitster · gitster · commit 1e7ef0253c91 · 2009-04-02T12:02:25.000-07:00
* js/maint-1.6.0-exec-path-env:
  Propagate --exec-path setting to external commands via GIT_EXEC_PATH
diff --git a/exec_cmd.c b/exec_cmd.c
@@ -61,6 +61,10 @@ const char *git_extract_argv0_path(const char *argv0)
 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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,10 @@ const char git_extract_argv0_path(const char argv0)`
`61`	`61`	`void git_set_argv_exec_path(const char *exec_path)`
`62`	`62`	`{`
`63`	`63`	`argv_exec_path = exec_path;`
	`64`	`+ /*`
	`65`	`+ * Propagate this setting to external programs.`
	`66`	`+ */`
	`67`	`+ setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);`
`64`	`68`	`}`
`65`	`69`
`66`	`70`