t/t3437: fixup the test 'multiple fixup -c opens editor once'

In the test, FAKE_COMMIT_MESSAGE replaces the commit message each
time it is invoked so there will be only one instance of "Modified-A3"
no matter how many times we invoke the editor. Let's fix this and use
FAKE_COMMIT_AMEND instead so that it adds "Modified-A3" once for each
time the editor is invoked.

This patch also removes the check for counting the number of
"Modified-A3" lines and instead compares the whole message to check
that the commenting code works correctly for 'fixup -c' as well as
'fixup -C'.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3437-rebase-fixup-options.sh b/t/t3437-rebase-fixup-options.sh
index 6e981fa487a389f5b5c0522d4d3a6bde34541998..a5a20354e3ff6ff95c429e28c584020b8a99a38e 100755 (executable)
--- a/t/t3437-rebase-fixup-options.sh
+++ b/t/t3437-rebase-fixup-options.sh
@@ -197,14 +197,16 @@ test_expect_success 'first fixup -C commented out in sequence fixup fixup -C fix
 test_expect_success 'multiple fixup -c opens editor once' '
        test_when_finished "test_might_fail git rebase --abort" &&
        git checkout --detach A3 &&
-       FAKE_COMMIT_MESSAGE="Modified-A3" \
+       git log -1 --pretty=format:%B >expected-message &&
+       test_write_lines "" "Modified-A3" >>expected-message &&
+       FAKE_COMMIT_AMEND="Modified-A3" \
                FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
                EXPECT_HEADER_COUNT=4 \
                git rebase -i A &&
        test_cmp_rev HEAD^ A &&
        get_author HEAD >actual-author &&
        test_cmp expected-author actual-author &&
-       test 1 = $(git show | grep Modified-A3 | wc -l)
+       test_commit_message HEAD expected-message
 '
 
 test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '