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

gitster · gitster · commit 1f398ee77255 · 2009-04-08T23:01:10.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
@@ -25,6 +25,10 @@ void git_set_argv0_path(const char *path)
 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
`@@ -25,6 +25,10 @@ void git_set_argv0_path(const char *path)`
`25`	`25`	`void git_set_argv_exec_path(const char *exec_path)`
`26`	`26`	`{`
`27`	`27`	`argv_exec_path = exec_path;`
	`28`	`+ /*`
	`29`	`+ * Propagate this setting to external programs.`
	`30`	`+ */`
	`31`	`+ setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);`
`28`	`32`	`}`
`29`	`33`
`30`	`34`