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 /t | |
| 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 't')
| -rwxr-xr-x | t/t7514-commit-patch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7514-commit-patch.sh b/t/t7514-commit-patch.sh index 41dd37af75..998a2103c7 100755 --- a/t/t7514-commit-patch.sh +++ b/t/t7514-commit-patch.sh @@ -15,7 +15,7 @@ test_expect_success 'setup (initial)' ' git commit -m commit1 ' -test_expect_failure 'edit hunk "commit -p -m message"' ' +test_expect_success 'edit hunk "commit -p -m message"' ' test_when_finished "rm -f editor_was_started" && rm -f editor_was_started && echo more >>file && @@ -23,7 +23,7 @@ test_expect_failure 'edit hunk "commit -p -m message"' ' test -r editor_was_started ' -test_expect_failure 'edit hunk "commit --dry-run -p -m message"' ' +test_expect_success 'edit hunk "commit --dry-run -p -m message"' ' test_when_finished "rm -f editor_was_started" && rm -f editor_was_started && echo more >>file && |