{"thread":{"id":"61300","subject":"[PATCH 0/3] Cleanup rebase signoff tests","startedAt":"2024-04-09T15:27:28Z","lastAt":"2024-04-12T13:53:53Z","messageCount":12,"participants":["Phillip Wood via GitGitGadget","Junio C Hamano","phillip.wood123@gmail.com","Phillip Wood"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"492636","messageId":"pull.1713.git.1712676444.gitgitgadget@gmail.com","threadId":"61300","inReplyTo":null,"subject":"[PATCH 0/3] Cleanup rebase signoff tests","fromName":"Phillip Wood via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-04-09T15:27:21Z","receivedAt":"2024-04-09T15:27:28Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"This series cleans up the tests for \"git rebase --signoff\" in preparation\nfor extending them and fixing a couple of bugs in a future series. The\ncleanups are:\n\n * move test setup into \"test_expect_success\"\n * stop running git upstream of a pipe\n * restore \"git rebase --apply --signoff\" coverage\n\nPhillip Wood (3):\n  t3428: modernize test setup\n  t3428: use test_commit_message\n  t3428: restore coverage for \"apply\" backend\n\n t/t3428-rebase-signoff.sh | 67 ++++++++++++++++++---------------------\n 1 file changed, 30 insertions(+), 37 deletions(-)\n\n\nbase-commit: 19981daefd7c147444462739375462b49412ce33\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1713%2Fphillipwood%2Fcleanup-rebase-signoff-tests-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1713/phillipwood/cleanup-rebase-signoff-tests-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1713\n-- \ngitgitgadget\n"},{"id":"492637","messageId":"35d4178d106daf4bd1407b1fc8ba6029a6dce288.1712676444.git.gitgitgadget@gmail.com","threadId":"61300","inReplyTo":"pull.1713.git.1712676444.gitgitgadget@gmail.com","subject":"[PATCH 1/3] t3428: modernize test setup","fromName":"Phillip Wood via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-04-09T15:27:22Z","receivedAt":"2024-04-09T15:27:29Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nPerform the setup in a dedicated test so the later tests can be run\nindependently. Also avoid running git upstream of a pipe and take\nadvantage of test_commit.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n t/t3428-rebase-signoff.sh | 42 +++++++++++++++++++--------------------\n 1 file changed, 21 insertions(+), 21 deletions(-)\n\ndiff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh\nindex e1b1e947647..975b859ce09 100755\n--- a/t/t3428-rebase-signoff.sh\n+++ b/t/t3428-rebase-signoff.sh\n@@ -8,37 +8,37 @@ This test runs git rebase --signoff and make sure that it works.\n TEST_PASSES_SANITIZE_LEAK=true\n . ./test-lib.sh\n \n-# A simple file to commit\n-cat >file <<EOF\n-a\n-EOF\n+test_expect_success 'setup' '\n+\tgit commit --allow-empty -m \"Initial empty commit\" &&\n+\ttest_commit first file a &&\n+\n+\tident=\"$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\" &&\n \n-# Expected commit message for initial commit after rebase --signoff\n-cat >expected-initial-signed <<EOF\n-Initial empty commit\n+\t# Expected commit message for initial commit after rebase --signoff\n+\tcat >expected-initial-signed <<-EOF &&\n+\tInitial empty commit\n \n-Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e \"s/>.*/>/\")\n-EOF\n+\tSigned-off-by: $ident\n+\tEOF\n \n-# Expected commit message after rebase --signoff\n-cat >expected-signed <<EOF\n-first\n+\t# Expected commit message after rebase --signoff\n+\tcat >expected-signed <<-EOF &&\n+\tfirst\n \n-Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e \"s/>.*/>/\")\n-EOF\n+\tSigned-off-by: $ident\n+\tEOF\n \n-# Expected commit message after rebase without --signoff (or with --no-signoff)\n-cat >expected-unsigned <<EOF\n-first\n-EOF\n+\t# Expected commit message after rebase without --signoff (or with --no-signoff)\n+\tcat >expected-unsigned <<-EOF &&\n+\tfirst\n+\tEOF\n \n+\tgit config alias.rbs \"rebase --signoff\"\n+'\n \n # We configure an alias to do the rebase --signoff so that\n # on the next subtest we can show that --no-signoff overrides the alias\n test_expect_success 'rebase --signoff adds a sign-off line' '\n-\tgit commit --allow-empty -m \"Initial empty commit\" &&\n-\tgit add file && git commit -m first &&\n-\tgit config alias.rbs \"rebase --signoff\" &&\n \tgit rbs HEAD^ &&\n \tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" > actual &&\n \ttest_cmp expected-signed actual\n-- \ngitgitgadget\n\n"},{"id":"492638","messageId":"cbe355e6ae84414118badd5c98d302010f4e2a47.1712676444.git.gitgitgadget@gmail.com","threadId":"61300","inReplyTo":"pull.1713.git.1712676444.gitgitgadget@gmail.com","subject":"[PATCH 2/3] t3428: use test_commit_message","fromName":"Phillip Wood via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-04-09T15:27:23Z","receivedAt":"2024-04-09T15:27:29Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nUsing a helper function makes the tests shorter and avoids running \"git\ncat-file\" upstream of a pipe.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n t/t3428-rebase-signoff.sh | 21 +++++++--------------\n 1 file changed, 7 insertions(+), 14 deletions(-)\n\ndiff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh\nindex 975b859ce09..133e54114f6 100755\n--- a/t/t3428-rebase-signoff.sh\n+++ b/t/t3428-rebase-signoff.sh\n@@ -40,15 +40,13 @@ test_expect_success 'setup' '\n # on the next subtest we can show that --no-signoff overrides the alias\n test_expect_success 'rebase --signoff adds a sign-off line' '\n \tgit rbs HEAD^ &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" > actual &&\n-\ttest_cmp expected-signed actual\n+\ttest_commit_message HEAD expected-signed\n '\n \n test_expect_success 'rebase --no-signoff does not add a sign-off line' '\n \tgit commit --amend -m \"first\" &&\n \tgit rbs --no-signoff HEAD^ &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" > actual &&\n-\ttest_cmp expected-unsigned actual\n+\ttest_commit_message HEAD expected-unsigned\n '\n \n test_expect_success 'rebase --exec --signoff adds a sign-off line' '\n@@ -56,30 +54,25 @@ test_expect_success 'rebase --exec --signoff adds a sign-off line' '\n \tgit commit --amend -m \"first\" &&\n \tgit rebase --exec \"touch exec\" --signoff HEAD^ &&\n \ttest_path_is_file exec &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" >actual &&\n-\ttest_cmp expected-signed actual\n+\ttest_commit_message HEAD expected-signed\n '\n \n test_expect_success 'rebase --root --signoff adds a sign-off line' '\n \tgit commit --amend -m \"first\" &&\n \tgit rebase --root --keep-empty --signoff &&\n-\tgit cat-file commit HEAD^ | sed -e \"1,/^\\$/d\" >actual &&\n-\ttest_cmp expected-initial-signed actual &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" >actual &&\n-\ttest_cmp expected-signed actual\n+\ttest_commit_message HEAD^ expected-initial-signed &&\n+\ttest_commit_message HEAD expected-signed\n '\n \n test_expect_success 'rebase -i --signoff fails' '\n \tgit commit --amend -m \"first\" &&\n \tgit rebase -i --signoff HEAD^ &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" >actual &&\n-\ttest_cmp expected-signed actual\n+\ttest_commit_message HEAD expected-signed\n '\n \n test_expect_success 'rebase -m --signoff fails' '\n \tgit commit --amend -m \"first\" &&\n \tgit rebase -m --signoff HEAD^ &&\n-\tgit cat-file commit HEAD | sed -e \"1,/^\\$/d\" >actual &&\n-\ttest_cmp expected-signed actual\n+\ttest_commit_message HEAD expected-signed\n '\n test_done\n-- \ngitgitgadget\n\n"},{"id":"492639","messageId":"b45af37e3c0a22cc9e0514eb681300be0b968e02.1712676444.git.gitgitgadget@gmail.com","threadId":"61300","inReplyTo":"pull.1713.git.1712676444.gitgitgadget@gmail.com","subject":"[PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"Phillip Wood via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-04-09T15:27:24Z","receivedAt":"2024-04-09T15:27:30Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"From: Phillip Wood <phillip.wood@dunelm.org.uk>\n\nThis test file assumes the \"apply\" backend is the default which is not\nthe case since 2ac0d6273f (rebase: change the default backend from \"am\"\nto \"merge\", 2020-02-15). Make sure the \"apply\" backend is tested by\nspecifying it explicitly.\n\nSigned-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n---\n t/t3428-rebase-signoff.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh\nindex 133e54114f6..1bebd1ce74a 100755\n--- a/t/t3428-rebase-signoff.sh\n+++ b/t/t3428-rebase-signoff.sh\n@@ -38,8 +38,8 @@ test_expect_success 'setup' '\n \n # We configure an alias to do the rebase --signoff so that\n # on the next subtest we can show that --no-signoff overrides the alias\n-test_expect_success 'rebase --signoff adds a sign-off line' '\n-\tgit rbs HEAD^ &&\n+test_expect_success 'rebase --apply --signoff adds a sign-off line' '\n+\tgit rbs --apply HEAD^ &&\n \ttest_commit_message HEAD expected-signed\n '\n \n-- \ngitgitgadget\n"},{"id":"492665","messageId":"xmqq4jca16fs.fsf@gitster.g","threadId":"61300","inReplyTo":"cbe355e6ae84414118badd5c98d302010f4e2a47.1712676444.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 2/3] t3428: use test_commit_message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-04-09T23:07:19Z","receivedAt":"2024-04-09T23:07:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Phillip Wood via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Phillip Wood <phillip.wood@dunelm.org.uk>\n>\n> Using a helper function makes the tests shorter and avoids running \"git\n> cat-file\" upstream of a pipe.\n\nNice.\n"},{"id":"492666","messageId":"xmqqzfu2yw00.fsf@gitster.g","threadId":"61300","inReplyTo":"b45af37e3c0a22cc9e0514eb681300be0b968e02.1712676444.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-04-09T23:08:47Z","receivedAt":"2024-04-09T23:08:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Phillip Wood via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Phillip Wood <phillip.wood@dunelm.org.uk>\n>\n> This test file assumes the \"apply\" backend is the default which is not\n> the case since 2ac0d6273f (rebase: change the default backend from \"am\"\n> to \"merge\", 2020-02-15). Make sure the \"apply\" backend is tested by\n> specifying it explicitly.\n\nHmph, doesn't this lose coverage for the merge backend, though?\n\n> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n> ---\n>  t/t3428-rebase-signoff.sh | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh\n> index 133e54114f6..1bebd1ce74a 100755\n> --- a/t/t3428-rebase-signoff.sh\n> +++ b/t/t3428-rebase-signoff.sh\n> @@ -38,8 +38,8 @@ test_expect_success 'setup' '\n>  \n>  # We configure an alias to do the rebase --signoff so that\n>  # on the next subtest we can show that --no-signoff overrides the alias\n> -test_expect_success 'rebase --signoff adds a sign-off line' '\n> -\tgit rbs HEAD^ &&\n> +test_expect_success 'rebase --apply --signoff adds a sign-off line' '\n> +\tgit rbs --apply HEAD^ &&\n>  \ttest_commit_message HEAD expected-signed\n>  '\n"},{"id":"492698","messageId":"6ab115bf-7b78-4633-a64c-9a0925d68e3f@gmail.com","threadId":"61300","inReplyTo":"xmqqzfu2yw00.fsf@gitster.g","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-04-10T09:42:10Z","receivedAt":"2024-04-10T09:42:15Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Junio\n\nOn 10/04/2024 00:08, Junio C Hamano wrote:\n> \"Phillip Wood via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n> \n>> From: Phillip Wood <phillip.wood@dunelm.org.uk>\n>>\n>> This test file assumes the \"apply\" backend is the default which is not\n>> the case since 2ac0d6273f (rebase: change the default backend from \"am\"\n>> to \"merge\", 2020-02-15). Make sure the \"apply\" backend is tested by\n>> specifying it explicitly.\n> \n> Hmph, doesn't this lose coverage for the merge backend, though?\n\nI don't think so, we had coverage for the merge backend from the other \ntests before 2ac0d6273f as all of the other tests in this file use the \nmerge backend. We're no longer testing \"--signoff\" without specifying \nsome other option that selects a backend but it seems unlikely that we \ncould break that without breaking one of the other tests.\n\nBest Wishes\n\nPhillip\n\n> \n>> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n>> ---\n>>   t/t3428-rebase-signoff.sh | 4 ++--\n>>   1 file changed, 2 insertions(+), 2 deletions(-)\n>>\n>> diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh\n>> index 133e54114f6..1bebd1ce74a 100755\n>> --- a/t/t3428-rebase-signoff.sh\n>> +++ b/t/t3428-rebase-signoff.sh\n>> @@ -38,8 +38,8 @@ test_expect_success 'setup' '\n>>   \n>>   # We configure an alias to do the rebase --signoff so that\n>>   # on the next subtest we can show that --no-signoff overrides the alias\n>> -test_expect_success 'rebase --signoff adds a sign-off line' '\n>> -\tgit rbs HEAD^ &&\n>> +test_expect_success 'rebase --apply --signoff adds a sign-off line' '\n>> +\tgit rbs --apply HEAD^ &&\n>>   \ttest_commit_message HEAD expected-signed\n>>   '\n"},{"id":"492714","messageId":"xmqqjzl5z4a9.fsf@gitster.g","threadId":"61300","inReplyTo":"6ab115bf-7b78-4633-a64c-9a0925d68e3f@gmail.com","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-04-10T14:22:06Z","receivedAt":"2024-04-10T14:22:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"phillip.wood123@gmail.com writes:\n\n>> Hmph, doesn't this lose coverage for the merge backend, though?\n>\n> I don't think so, we had coverage for the merge backend from the other\n> tests before 2ac0d6273f as all of the other tests in this file use the\n> merge backend. We're no longer testing \"--signoff\" without specifying\n> some other option that selects a backend but it seems unlikely that we\n> could break that without breaking one of the other tests.\n\nOK, so we have \"rebase --merge --signoff\" tested elsewhere and we\nare replacing \"rebase --signoff\" with \"rebase --apply --signoff\"?\n\nThanks.\n\n"},{"id":"492716","messageId":"5e0ec9eb-2e2c-4cb6-91e2-eef6b5c4300c@gmail.com","threadId":"61300","inReplyTo":"xmqqjzl5z4a9.fsf@gitster.g","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-04-10T15:23:55Z","receivedAt":"2024-04-10T15:23:58Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 10/04/2024 15:22, Junio C Hamano wrote:\n> phillip.wood123@gmail.com writes:\n> \n>>> Hmph, doesn't this lose coverage for the merge backend, though?\n>>\n>> I don't think so, we had coverage for the merge backend from the other\n>> tests before 2ac0d6273f as all of the other tests in this file use the\n>> merge backend. We're no longer testing \"--signoff\" without specifying\n>> some other option that selects a backend but it seems unlikely that we\n>> could break that without breaking one of the other tests.\n> \n> OK, so we have \"rebase --merge --signoff\" tested elsewhere and we\n> are replacing \"rebase --signoff\" with \"rebase --apply --signoff\"?\n\nExactly\n\n> Thanks.\n> \n"},{"id":"492724","messageId":"xmqqa5m1w4ik.fsf@gitster.g","threadId":"61300","inReplyTo":"5e0ec9eb-2e2c-4cb6-91e2-eef6b5c4300c@gmail.com","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-04-10T16:45:23Z","receivedAt":"2024-04-10T16:45:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"phillip.wood123@gmail.com writes:\n\n> On 10/04/2024 15:22, Junio C Hamano wrote:\n>> phillip.wood123@gmail.com writes:\n>> \n>>>> Hmph, doesn't this lose coverage for the merge backend, though?\n>>>\n>>> I don't think so, we had coverage for the merge backend from the other\n>>> tests before 2ac0d6273f as all of the other tests in this file use the\n>>> merge backend. We're no longer testing \"--signoff\" without specifying\n>>> some other option that selects a backend but it seems unlikely that we\n>>> could break that without breaking one of the other tests.\n>> OK, so we have \"rebase --merge --signoff\" tested elsewhere and we\n>> are replacing \"rebase --signoff\" with \"rebase --apply --signoff\"?\n>\n> Exactly\n\nPerhaps we can write that in the log message to help the next person\nwho reads the patch?  Something like...\n\n    t3428: restore coverage for \"apply\" backend\n    \n    This test file assumes the \"apply\" backend is the default which is\n    not the case since 2ac0d6273f (rebase: change the default backend\n    from \"am\" to \"merge\", 2020-02-15).  The way \"merge\" backend honors\n    \"--signoff\" is already tested elsewhere, so make sure the \"apply\"\n    backend is tested by specifying it explicitly.\n    \n    Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n    Signed-off-by: Junio C Hamano <gitster@pobox.com>\n"},{"id":"492857","messageId":"33c6c944-e1f7-48e1-a9f2-8bd5027b7c61@gmail.com","threadId":"61300","inReplyTo":"xmqqa5m1w4ik.fsf@gitster.g","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-04-12T09:33:25Z","receivedAt":"2024-04-12T09:33:27Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 10/04/2024 17:45, Junio C Hamano wrote:\n> phillip.wood123@gmail.com writes:\n> \n>> On 10/04/2024 15:22, Junio C Hamano wrote:\n>>> phillip.wood123@gmail.com writes:\n>>>\n>>>>> Hmph, doesn't this lose coverage for the merge backend, though?\n>>>>\n>>>> I don't think so, we had coverage for the merge backend from the other\n>>>> tests before 2ac0d6273f as all of the other tests in this file use the\n>>>> merge backend. We're no longer testing \"--signoff\" without specifying\n>>>> some other option that selects a backend but it seems unlikely that we\n>>>> could break that without breaking one of the other tests.\n>>> OK, so we have \"rebase --merge --signoff\" tested elsewhere and we\n>>> are replacing \"rebase --signoff\" with \"rebase --apply --signoff\"?\n>>\n>> Exactly\n> \n> Perhaps we can write that in the log message to help the next person\n> who reads the patch?  Something like...\n> \n>      t3428: restore coverage for \"apply\" backend\n>      \n>      This test file assumes the \"apply\" backend is the default which is\n>      not the case since 2ac0d6273f (rebase: change the default backend\n>      from \"am\" to \"merge\", 2020-02-15).  The way \"merge\" backend honors\n>      \"--signoff\" is already tested elsewhere, so make sure the \"apply\"\n>      backend is tested by specifying it explicitly.\n>      \n>      Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n>      Signed-off-by: Junio C Hamano <gitster@pobox.com>\n\nSounds good, I'll send a re-roll\n\nThanks\n\nPhillip\n"},{"id":"492871","messageId":"a42bd1c4-1d44-427e-ab4d-76a72b02502f@gmail.com","threadId":"61300","inReplyTo":"33c6c944-e1f7-48e1-a9f2-8bd5027b7c61@gmail.com","subject":"Re: [PATCH 3/3] t3428: restore coverage for \"apply\" backend","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2024-04-12T13:53:51Z","receivedAt":"2024-04-12T13:53:53Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 12/04/2024 10:33, phillip.wood123@gmail.com wrote:\n> On 10/04/2024 17:45, Junio C Hamano wrote:\n>> phillip.wood123@gmail.com writes:\n>> Perhaps we can write that in the log message to help the next person\n>> who reads the patch?  Something like...\n>>\n>>      t3428: restore coverage for \"apply\" backend\n>>      This test file assumes the \"apply\" backend is the default which is\n>>      not the case since 2ac0d6273f (rebase: change the default backend\n>>      from \"am\" to \"merge\", 2020-02-15).  The way \"merge\" backend honors\n>>      \"--signoff\" is already tested elsewhere, so make sure the \"apply\"\n>>      backend is tested by specifying it explicitly.\n>>      Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>\n>>      Signed-off-by: Junio C Hamano <gitster@pobox.com>\n> \n> Sounds good, I'll send a re-roll\n\nOh, it looks like this hit next yesterday\n\nPhillip\n"}]}