summaryrefslogtreecommitdiff
path: root/compat/mingw.h
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-09-11 17:40:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-09-11 23:33:54 (GMT)
commit2affea4125a0ae6c528a14f14731748c1fad9a8a (patch)
tree81ba1ff206e66c92aa340ba4615a3d901039b150 /compat/mingw.h
parent434a6db7dcf8688fe08098e218113c18b7c9aeaf (diff)
downloadgit-2affea4125a0ae6c528a14f14731748c1fad9a8a.zip
git-2affea4125a0ae6c528a14f14731748c1fad9a8a.tar.gz
git-2affea4125a0ae6c528a14f14731748c1fad9a8a.tar.bz2
start_command: do not clobber cmd->env on Windows code path
Previously, it would not be possible to call start_command twice for the same struct child_process that has env set. The fix is achieved by moving the loop that modifies the environment block into a helper function. This also allows us to make two other helper functions static. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.h')
-rw-r--r--compat/mingw.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index 948de66..c43917c 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -222,9 +222,8 @@ void mingw_open_html(const char *path);
* helpers
*/
-char **copy_environ(void);
+char **make_augmented_environ(const char *const *vars);
void free_environ(char **env);
-char **env_setenv(char **env, const char *name);
/*
* A replacement of main() that ensures that argv[0] has a path