summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-05-23 20:21:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-24 05:38:44 (GMT)
commit3427b375b594b93ed47ae80ca1d6bb361d7d8f5e (patch)
treeb64edcb1ed76207acc12ebc534a3cb7102ff6652 /run-command.c
parentee4931486b752b0a3ee04be31f25aed13913cb31 (diff)
downloadgit-3427b375b594b93ed47ae80ca1d6bb361d7d8f5e.zip
git-3427b375b594b93ed47ae80ca1d6bb361d7d8f5e.tar.gz
git-3427b375b594b93ed47ae80ca1d6bb361d7d8f5e.tar.bz2
Allow environment variables to be unset in the processes started by run_command
To unset a variable, just specify its name, without "=". For example: const char *env[] = {"GIT_DIR=.git", "PWD", NULL}; const char *argv[] = {"git-ls-files", "-s", NULL}; int err = run_command_v_opt_cd_env(argv, RUN_GIT_CMD, ".", env); The PWD will be unset before executing git-ls-files. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/run-command.c b/run-command.c
index 4ee4bdf..7e779d3 100644
--- a/run-command.c
+++ b/run-command.c
@@ -77,8 +77,12 @@ int start_command(struct child_process *cmd)
die("exec %s: cd to %s failed (%s)", cmd->argv[0],
cmd->dir, strerror(errno));
if (cmd->env) {
- for (; *cmd->env; cmd->env++)
- putenv((char*)*cmd->env);
+ for (; *cmd->env; cmd->env++) {
+ if (strchr(*cmd->env, '='))
+ putenv((char*)*cmd->env);
+ else
+ unsetenv(*cmd->env);
+ }
}
if (cmd->git_cmd) {
execv_git_cmd(cmd->argv);