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 /builtin/checkout.c | |
| 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 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 5df3837e31..624bfbad7c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -53,10 +53,10 @@ struct checkout_opts { static int post_checkout_hook(struct commit *old, struct commit *new, int changed) { - return run_hook(NULL, "post-checkout", - sha1_to_hex(old ? old->object.sha1 : null_sha1), - sha1_to_hex(new ? new->object.sha1 : null_sha1), - changed ? "1" : "0", NULL); + return run_hook_le(NULL, "post-checkout", + sha1_to_hex(old ? old->object.sha1 : null_sha1), + sha1_to_hex(new ? new->object.sha1 : null_sha1), + changed ? "1" : "0", NULL); /* "new" can be NULL when checking out from the index before a commit exists. */ |