diff options
author | Benoit Pierre <benoit.pierre@gmail.com> | 2014-03-18 11:00:53 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 11:25:12 -0700 |
commit | 15048f8a9ace23df67161746ca76b4f46114deee (patch) | |
tree | 5b7d00d2da24c8e31ede5d028b889bf06a63aaaf /run-command.h | |
parent | 91c9c8692056c0553c6ea9239ccd46f7f3dbd877 (diff) | |
download | git-15048f8a9ace23df67161746ca76b4f46114deee.tar.gz |
commit: fix patch hunk editing with "commit -p -m"
Don't change git environment: move the GIT_EDITOR=":" override to the
hook command subprocess, like it's already done for GIT_INDEX_FILE.
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.h')
-rw-r--r-- | run-command.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/run-command.h b/run-command.h index 6b985afd07..88460f9bfe 100644 --- a/run-command.h +++ b/run-command.h @@ -47,7 +47,11 @@ int run_command(struct child_process *); extern char *find_hook(const char *name); LAST_ARG_MUST_BE_NULL -extern int run_hook(const char *index_file, const char *name, ...); +extern int run_hook_le(const char *const *env, const char *name, ...); +extern int run_hook_ve(const char *const *env, const char *name, va_list args); + +LAST_ARG_MUST_BE_NULL +extern int run_hook_with_custom_index(const char *index_file, const char *name, ...); #define RUN_COMMAND_NO_STDIN 1 #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ |