Thread (19 messages) 19 messages, 7 authors, 2016-06-15

Re: [PATCH 3/7] test patch hunk editing with "commit -p -m"

From: Philip Oakley <hidden>
Date: 2016-06-15 23:00:16

mincro nit.
From: "Benoit Pierre" <redacted>
Add (failing) test: with commit changing the environment to let hooks
now that no editor will be used (by setting GIT_EDITOR to ":"), the
s/now/know/
quoted hunk ↗ jump to hunk
"edit hunk" functionality does not work (no editor is launched and the
whole hunk is committed).

Signed-off-by: Benoit Pierre <redacted>
---
t/t7513-commit_-p_-m_hunk_edit.sh | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100755 t/t7513-commit_-p_-m_hunk_edit.sh
diff --git a/t/t7513-commit_-p_-m_hunk_edit.sh b/t/t7513-commit_-p_-m_hunk_edit.sh
new file mode 100755
index 0000000..994939a
--- /dev/null
+++ b/t/t7513-commit_-p_-m_hunk_edit.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+test_description='hunk edit with "commit -p -m"'
+. ./test-lib.sh
+
+if ! test_have_prereq PERL
+then
+ skip_all="skipping '$test_description' tests, perl not available"
+ test_done
+fi
+
+test_expect_success 'setup (initial)' '
+ echo line1 >file &&
+ git add file &&
+ git commit -m commit1 &&
+ echo line3 >>file &&
+ cat >expect <<-\EOF
+ diff --git a/file b/file
+ index a29bdeb..c0d0fb4 100644
+ --- a/file
+ +++ b/file
+ @@ -1 +1,2 @@
+ line1
+ +line2
+ EOF
+'
+
+test_expect_failure 'edit hunk "commit -p -m message"' '
+ echo e | env GIT_EDITOR="sed s/+line3\$/+line2/ -i" git commit -p -m commit2 file &&
+ git diff HEAD^ HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_done
-- 
1.9.0

--
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help