From 15048f8a9ace23df67161746ca76b4f46114deee Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Tue, 18 Mar 2014 11:00:53 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- t/t7514-commit-patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't') 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 && -- cgit v1.2.1