Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: > On Mon, Mar 10, 2014 at 2:49 PM, Benoit Pierre <benoit.pierre@xxxxxxxxx> wrote: >> Add (failing) test: with commit changing the environment to let hooks >> now that no editor will be used (by setting GIT_EDITOR to ":"), the >> "edit hunk" functionality does not work (no editor is launched and the >> whole hunk is committed). >> >> Signed-off-by: Benoit Pierre <benoit.pierre@xxxxxxxxx> >> --- >> 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 > > Is it possible to give this file a name less unusual and more > consistent with other test scripts? Perhaps choose a more generic name > which may allow other similar tests to be added to the file in the > future (if needed)? Surely. There are "reset-patch" and "checkout-patch" tests, and if we were to add something like this, I'd imagine "commit-patch" would be a logical name for the new test. >> 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 > > In the previous review, the suggestion was that creation of 'expect' > should be moved to the test below where it is actually used rather > than into the 'setup' phase above. > >> +' >> + >> +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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html