{"thread":{"id":"58180","subject":"[PATCH] t4200: drop irrelevant code","startedAt":"2022-07-18T15:45:52Z","lastAt":"2022-07-19T05:21:21Z","messageCount":3,"participants":["Martin Ågren","Junio C Hamano","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"459280","messageId":"20220718154322.2177166-1-martin.agren@gmail.com","threadId":"58180","inReplyTo":null,"subject":"[PATCH] t4200: drop irrelevant code","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2022-07-18T15:43:22Z","receivedAt":"2022-07-18T15:45:52Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"While setting up an unresolved merge for `git rerere`, we run `git\nrev-parse` and `git fmt-merge-msg` to create a variable `$fifth` and a\ncommit-message file `msg`, which we then never actually use. This has\nbeen like that since these tests were added in 672d1b789b (\"rerere:\nmigrate to parse-options API\", 2010-08-05). This does exercise `git\nrev-parse` and `git fmt-merge-msg`, but doesn't contribute to testing\n`git rerere`. Drop these lines.\n\nReported-by: Eric Sunshine \nSigned-off-by: Martin Ågren \n---\n This is quite late fallout from Eric's review [1] of some commits that\n have already gone in.\n\n [1] https://lore.kernel.org/git/CAPig+cSjHg2-WYqdkZAS0ye1goj_=5RN3mdjt0-4kSBqNm6WLg@mail.gmail.com/\n\n t/t4200-rerere.sh | 3 ---\n 1 file changed, 3 deletions(-)\n\ndiff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh\nindex 9f8c76dffb..7025cfdae5 100755\n--- a/t/t4200-rerere.sh\n+++ b/t/t4200-rerere.sh\n@@ -358,23 +358,20 @@ test_expect_success 'set up an unresolved merge' '\n \theadblob=$(git rev-parse version2:file3) &&\n \tmergeblob=$(git rev-parse fifth:file3) &&\n \tcat >expected.unresolved <<-EOF &&\n \t100644 $headblob 2\tfile3\n \t100644 $mergeblob 3\tfile3\n \tEOF\n \n \ttest_might_fail git config --unset rerere.autoupdate &&\n \tgit reset --hard &&\n \tgit checkout version2 &&\n-\tfifth=$(git rev-parse fifth) &&\n-\techo \"$fifth\t\tbranch fifth of .\" |\n-\tgit fmt-merge-msg >msg &&\n \tancestor=$(git merge-base version2 fifth) &&\n \ttest_must_fail git merge-recursive \"$ancestor\" -- HEAD fifth &&\n \n \tgit ls-files --stage >failedmerge &&\n \tcp file3 file3.conflict &&\n \n \tgit ls-files -u >actual &&\n \ttest_cmp expected.unresolved actual\n '\n \n-- \n2.37.1.373.g4dd4a117ec\n\n"},{"id":"459307","messageId":"xmqq4jzeqozi.fsf@gitster.g","threadId":"58180","inReplyTo":"20220718154322.2177166-1-martin.agren@gmail.com","subject":"Re: [PATCH] t4200: drop irrelevant code","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-07-18T18:01:37Z","receivedAt":"2022-07-18T18:01:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> While setting up an unresolved merge for `git rerere`, we run `git\n> rev-parse` and `git fmt-merge-msg` to create a variable `$fifth` and a\n> commit-message file `msg`, which we then never actually use. This has\n> been like that since these tests were added in 672d1b789b (\"rerere:\n> migrate to parse-options API\", 2010-08-05). This does exercise `git\n> rev-parse` and `git fmt-merge-msg`, but doesn't contribute to testing\n> `git rerere`. Drop these lines.\n\nVery well reasoned.\n\nWill queue, thanks. \n\n> Reported-by: Eric Sunshine \n> Signed-off-by: Martin Ågren \n> ---\n> This is quite late fallout from Eric's review [1] of some commits that\n> have already gone in.\n>\n> [1] https://lore.kernel.org/git/CAPig+cSjHg2-WYqdkZAS0ye1goj_=5RN3mdjt0-4kSBqNm6WLg@mail.gmail.com/\n>\n> t/t4200-rerere.sh | 3 ---\n> 1 file changed, 3 deletions(-)\n>\n> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh\n> index 9f8c76dffb..7025cfdae5 100755\n> --- a/t/t4200-rerere.sh\n> +++ b/t/t4200-rerere.sh\n> @@ -358,23 +358,20 @@ test_expect_success 'set up an unresolved merge' '\n> \theadblob=$(git rev-parse version2:file3) &&\n> \tmergeblob=$(git rev-parse fifth:file3) &&\n> \tcat >expected.unresolved <<-EOF &&\n> \t100644 $headblob 2\tfile3\n> \t100644 $mergeblob 3\tfile3\n> \tEOF\n> \n> \ttest_might_fail git config --unset rerere.autoupdate &&\n> \tgit reset --hard &&\n> \tgit checkout version2 &&\n> -\tfifth=$(git rev-parse fifth) &&\n> -\techo \"$fifth\t\tbranch fifth of .\" |\n> -\tgit fmt-merge-msg >msg &&\n> \tancestor=$(git merge-base version2 fifth) &&\n> \ttest_must_fail git merge-recursive \"$ancestor\" -- HEAD fifth &&\n> \n> \tgit ls-files --stage >failedmerge &&\n> \tcp file3 file3.conflict &&\n> \n> \tgit ls-files -u >actual &&\n> \ttest_cmp expected.unresolved actual\n> '\n"},{"id":"459343","messageId":"CAPig+cTb30T0Yq2MdrrT3zuq3_YVEAXia79rgReH0wrQpzHuKg@mail.gmail.com","threadId":"58180","inReplyTo":"20220718154322.2177166-1-martin.agren@gmail.com","subject":"Re: [PATCH] t4200: drop irrelevant code","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2022-07-19T05:21:06Z","receivedAt":"2022-07-19T05:21:21Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Jul 18, 2022 at 11:45 AM Martin Ågren wrote:\n> While setting up an unresolved merge for `git rerere`, we run `git\n> rev-parse` and `git fmt-merge-msg` to create a variable `$fifth` and a\n> commit-message file `msg`, which we then never actually use. This has\n> been like that since these tests were added in 672d1b789b (\"rerere:\n> migrate to parse-options API\", 2010-08-05). This does exercise `git\n> rev-parse` and `git fmt-merge-msg`, but doesn't contribute to testing\n> `git rerere`. Drop these lines.\n>\n> Reported-by: Eric Sunshine \n> Signed-off-by: Martin Ågren \n> ---\n> This is quite late fallout from Eric's review [1] of some commits that\n> have already gone in.\n>\n> [1] https://lore.kernel.org/git/CAPig+cSjHg2-WYqdkZAS0ye1goj_=5RN3mdjt0-4kSBqNm6WLg@mail.gmail.com/\n\nThanks for following up on this. The patch looks fine.\n"}]}