{"thread":{"id":"52198","subject":"[PATCH 0/1] t6024: modernize style","startedAt":"2019-11-05T23:58:27Z","lastAt":"2019-11-07T05:43:32Z","messageCount":6,"participants":["Elijah Newren via GitGitGadget","Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"385499","messageId":"pull.455.git.1572998303.gitgitgadget@gmail.com","threadId":"52198","inReplyTo":null,"subject":"[PATCH 0/1] t6024: modernize style","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-05T23:58:22Z","receivedAt":"2019-11-05T23:58:27Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"A simple patch to modernize t6024; this was a change I made a few months ago\nthat I apparently forgot; found while cleaning out old branches.\n\nElijah Newren (1):\n  t6024: modernize style\n\n t/t6024-recursive-merge.sh | 121 +++++++++++++++++++------------------\n 1 file changed, 62 insertions(+), 59 deletions(-)\n\n\nbase-commit: da72936f544fec5a335e66432610e4cef4430991\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-455%2Fnewren%2Ft6024-test-modernization-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-455/newren/t6024-test-modernization-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/455\n-- \ngitgitgadget\n"},{"id":"385500","messageId":"c6349cdbd057ccbcced3220ff3474b2e2083617e.1572998303.git.gitgitgadget@gmail.com","threadId":"52198","inReplyTo":"pull.455.git.1572998303.gitgitgadget@gmail.com","subject":"[PATCH 1/1] t6024: modernize style","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-05T23:58:23Z","receivedAt":"2019-11-05T23:58:29Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nNo substantive changes, just a few cosmetic changes:\n  * Indent steps of an individual test\n  * Don't have logic between the \"test_expect_success\" blocks that\n    the next block will depend upon, move it into the\n    test_expect_success section itself\n  * Fix spacing around redirection operators to match git style\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n t/t6024-recursive-merge.sh | 121 +++++++++++++++++++------------------\n 1 file changed, 62 insertions(+), 59 deletions(-)\n\ndiff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh\nindex 27c7de90ce..0cc876360c 100755\n--- a/t/t6024-recursive-merge.sh\n+++ b/t/t6024-recursive-merge.sh\n@@ -15,73 +15,76 @@ GIT_COMMITTER_DATE=\"2006-12-12 23:28:00 +0100\"\n export GIT_COMMITTER_DATE\n \n test_expect_success \"setup tests\" '\n-echo 1 > a1 &&\n-git add a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n-\n-git checkout -b A master &&\n-echo A > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:01\" git commit -m A a1 &&\n-\n-git checkout -b B master &&\n-echo B > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:02\" git commit -m B a1 &&\n-\n-git checkout -b D A &&\n-git rev-parse B > .git/MERGE_HEAD &&\n-echo D > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:03\" git commit -m D &&\n-\n-git symbolic-ref HEAD refs/heads/other &&\n-echo 2 > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:04\" git commit -m 2 a1 &&\n-\n-git checkout -b C &&\n-echo C > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:05\" git commit -m C a1 &&\n-\n-git checkout -b E C &&\n-git rev-parse B > .git/MERGE_HEAD &&\n-echo E > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:06\" git commit -m E &&\n-\n-git checkout -b G E &&\n-git rev-parse A > .git/MERGE_HEAD &&\n-echo G > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:07\" git commit -m G &&\n-\n-git checkout -b F D &&\n-git rev-parse C > .git/MERGE_HEAD &&\n-echo F > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:08\" git commit -m F\n+\techo 1 > a1 &&\n+\tgit add a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n+\n+\tgit checkout -b A master &&\n+\techo A > a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:01\" git commit -m A a1 &&\n+\n+\tgit checkout -b B master &&\n+\techo B > a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:02\" git commit -m B a1 &&\n+\n+\tgit checkout -b D A &&\n+\tgit rev-parse B > .git/MERGE_HEAD &&\n+\techo D > a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:03\" git commit -m D &&\n+\n+\tgit symbolic-ref HEAD refs/heads/other &&\n+\techo 2 > a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:04\" git commit -m 2 a1 &&\n+\n+\tgit checkout -b C &&\n+\techo C > a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:05\" git commit -m C a1 &&\n+\n+\tgit checkout -b E C &&\n+\tgit rev-parse B > .git/MERGE_HEAD &&\n+\techo E > a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:06\" git commit -m E &&\n+\n+\tgit checkout -b G E &&\n+\tgit rev-parse A > .git/MERGE_HEAD &&\n+\techo G > a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:07\" git commit -m G &&\n+\n+\tgit checkout -b F D &&\n+\tgit rev-parse C > .git/MERGE_HEAD &&\n+\techo F > a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:08\" git commit -m F\n '\n \n test_expect_success 'combined merge conflicts' '\n \ttest_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G\n '\n \n-cat > expect << EOF\n-<<<<<<< HEAD\n-F\n-=======\n-G\n->>>>>>> G\n-EOF\n+test_expect_success \"result contains a conflict\" '\n+\tcat >expect <<-EOF &&\n+\t\t<<<<<<< HEAD\n+\t\tF\n+\t\t=======\n+\t\tG\n+\t\t>>>>>>> G\n+\t\tEOF\n \n-test_expect_success \"result contains a conflict\" \"test_cmp expect a1\"\n-\n-git ls-files --stage > out\n-cat > expect << EOF\n-100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n-100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n-100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n-EOF\n+\ttest_cmp expect a1\n+'\n \n-test_expect_success \"virtual trees were processed\" \"test_cmp expect out\"\n+test_expect_success \"virtual trees were processed\" '\n+\tgit ls-files --stage >out &&\n+\tcat >expect <<-EOF &&\n+\t\t100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n+\t\t100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n+\t\t100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n+\t\tEOF\n+\ttest_cmp expect out\n+'\n \n test_expect_success 'refuse to merge binary files' '\n \tgit reset --hard &&\n-- \ngitgitgadget\n"},{"id":"385501","messageId":"CAPig+cRdG+RZOeXuJLfF7UyiBccHs6yWnCqt2d1oyTTuwp6=YQ@mail.gmail.com","threadId":"52198","inReplyTo":"c6349cdbd057ccbcced3220ff3474b2e2083617e.1572998303.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] t6024: modernize style","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2019-11-06T00:11:29Z","receivedAt":"2019-11-06T00:11:45Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Nov 5, 2019 at 6:58 PM Elijah Newren via GitGitGadget\n<gitgitgadget@gmail.com> wrote:\n> No substantive changes, just a few cosmetic changes:\n>   * Indent steps of an individual test\n>   * Don't have logic between the \"test_expect_success\" blocks that\n>     the next block will depend upon, move it into the\n>     test_expect_success section itself\n>   * Fix spacing around redirection operators to match git style\n>\n> Signed-off-by: Elijah Newren <newren@gmail.com>\n> ---\n> diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh\n> @@ -15,73 +15,76 @@ GIT_COMMITTER_DATE=\"2006-12-12 23:28:00 +0100\"\n>  test_expect_success \"setup tests\" '\n\nSince you're modernizing, perhaps use single quotes around the test\ntitle rather than double quotes. Same comment applies to other test\ntitles.\n\n> +       echo 1 > a1 &&\n\nThe commit message talks about fixing spacing around redirection\noperators but neither this instance nor any of the others in this\nfunction have been fixed.\n\n> +       git add a1 &&\n> +       GIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n> +       ...\n>  '\n> +       cat >expect <<-EOF &&\n\nSince there's no interpolation going on inside the here-doc, perhaps\nuse -\\EOF instead. Same comment applies to other here-docs.\n\n> +               <<<<<<< HEAD\n> +               F\n> +               =======\n> +               G\n> +               >>>>>>> G\n> +               EOF\n\nCustom in most scripts is to indent the here-doc body only as far as\nthe command which opens it (that is, give it the same indentation as\nthe 'cat' command). Same comment applies to other here-docs.\n"},{"id":"385504","messageId":"pull.455.v2.git.1573004049.gitgitgadget@gmail.com","threadId":"52198","inReplyTo":"pull.455.git.1572998303.gitgitgadget@gmail.com","subject":"[PATCH v2 0/1] t6024: modernize style","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-06T01:34:08Z","receivedAt":"2019-11-06T01:34:16Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"A simple patch to modernize t6024; this was a change I made a few months ago\nthat I apparently forgot; found while cleaning out old branches.\n\nChanges since v1:\n\n * Addressed feedback from Eric.\n\nElijah Newren (1):\n  t6024: modernize style\n\n t/t6024-recursive-merge.sh | 130 +++++++++++++++++++------------------\n 1 file changed, 67 insertions(+), 63 deletions(-)\n\n\nbase-commit: da72936f544fec5a335e66432610e4cef4430991\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-455%2Fnewren%2Ft6024-test-modernization-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-455/newren/t6024-test-modernization-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/455\n\nRange-diff vs v1:\n\n 1:  c6349cdbd0 ! 1:  0aaf1799e0 t6024: modernize style\n     @@ -15,9 +15,10 @@\n       --- a/t/t6024-recursive-merge.sh\n       +++ b/t/t6024-recursive-merge.sh\n      @@\n     + GIT_COMMITTER_DATE=\"2006-12-12 23:28:00 +0100\"\n       export GIT_COMMITTER_DATE\n       \n     - test_expect_success \"setup tests\" '\n     +-test_expect_success \"setup tests\" '\n      -echo 1 > a1 &&\n      -git add a1 &&\n      -GIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n     @@ -61,47 +62,48 @@\n      -echo F > a1 &&\n      -git update-index a1 &&\n      -GIT_AUTHOR_DATE=\"2006-12-12 23:00:08\" git commit -m F\n     -+\techo 1 > a1 &&\n     ++test_expect_success 'setup tests' '\n     ++\techo 1 >a1 &&\n      +\tgit add a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n      +\n      +\tgit checkout -b A master &&\n     -+\techo A > a1 &&\n     ++\techo A >a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:01\" git commit -m A a1 &&\n      +\n      +\tgit checkout -b B master &&\n     -+\techo B > a1 &&\n     ++\techo B >a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:02\" git commit -m B a1 &&\n      +\n      +\tgit checkout -b D A &&\n     -+\tgit rev-parse B > .git/MERGE_HEAD &&\n     -+\techo D > a1 &&\n     ++\tgit rev-parse B >.git/MERGE_HEAD &&\n     ++\techo D >a1 &&\n      +\tgit update-index a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:03\" git commit -m D &&\n      +\n      +\tgit symbolic-ref HEAD refs/heads/other &&\n     -+\techo 2 > a1 &&\n     ++\techo 2 >a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:04\" git commit -m 2 a1 &&\n      +\n      +\tgit checkout -b C &&\n     -+\techo C > a1 &&\n     ++\techo C >a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:05\" git commit -m C a1 &&\n      +\n      +\tgit checkout -b E C &&\n     -+\tgit rev-parse B > .git/MERGE_HEAD &&\n     -+\techo E > a1 &&\n     ++\tgit rev-parse B >.git/MERGE_HEAD &&\n     ++\techo E >a1 &&\n      +\tgit update-index a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:06\" git commit -m E &&\n      +\n      +\tgit checkout -b G E &&\n     -+\tgit rev-parse A > .git/MERGE_HEAD &&\n     -+\techo G > a1 &&\n     ++\tgit rev-parse A >.git/MERGE_HEAD &&\n     ++\techo G >a1 &&\n      +\tgit update-index a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:07\" git commit -m G &&\n      +\n      +\tgit checkout -b F D &&\n     -+\tgit rev-parse C > .git/MERGE_HEAD &&\n     -+\techo F > a1 &&\n     ++\tgit rev-parse C >.git/MERGE_HEAD &&\n     ++\techo F >a1 &&\n      +\tgit update-index a1 &&\n      +\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:08\" git commit -m F\n       '\n     @@ -117,36 +119,59 @@\n      -G\n      ->>>>>>> G\n      -EOF\n     -+test_expect_success \"result contains a conflict\" '\n     -+\tcat >expect <<-EOF &&\n     -+\t\t<<<<<<< HEAD\n     -+\t\tF\n     -+\t\t=======\n     -+\t\tG\n     -+\t\t>>>>>>> G\n     -+\t\tEOF\n     ++test_expect_success 'result contains a conflict' '\n     ++\tcat >expect <<-\\EOF &&\n     ++\t<<<<<<< HEAD\n     ++\tF\n     ++\t=======\n     ++\tG\n     ++\t>>>>>>> G\n     ++\tEOF\n       \n      -test_expect_success \"result contains a conflict\" \"test_cmp expect a1\"\n     --\n     ++\ttest_cmp expect a1\n     ++'\n     ++\n     ++test_expect_success 'virtual trees were processed' '\n     ++\tgit ls-files --stage >out &&\n     + \n      -git ls-files --stage > out\n      -cat > expect << EOF\n      -100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n      -100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n      -100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n      -EOF\n     -+\ttest_cmp expect a1\n     -+'\n     ++\tcat >expect <<-\\EOF &&\n     ++\t100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n     ++\t100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n     ++\t100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n     ++\tEOF\n       \n      -test_expect_success \"virtual trees were processed\" \"test_cmp expect out\"\n     -+test_expect_success \"virtual trees were processed\" '\n     -+\tgit ls-files --stage >out &&\n     -+\tcat >expect <<-EOF &&\n     -+\t\t100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n     -+\t\t100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n     -+\t\t100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n     -+\t\tEOF\n      +\ttest_cmp expect out\n      +'\n       \n       test_expect_success 'refuse to merge binary files' '\n       \tgit reset --hard &&\n     +-\tprintf \"\\0\" > binary-file &&\n     ++\tprintf \"\\0\" >binary-file &&\n     + \tgit add binary-file &&\n     + \tgit commit -m binary &&\n     + \tgit checkout G &&\n     +-\tprintf \"\\0\\0\" > binary-file &&\n     ++\tprintf \"\\0\\0\" >binary-file &&\n     + \tgit add binary-file &&\n     + \tgit commit -m binary2 &&\n     +-\ttest_must_fail git merge F > merge.out 2> merge.err &&\n     ++\ttest_must_fail git merge F >merge.out 2>merge.err &&\n     + \tgrep \"Cannot merge binary files: binary-file (HEAD vs. F)\" merge.err\n     + '\n     + \n     +@@\n     + \ttest 1 = $(git ls-files --unmerged | wc -l) &&\n     + \ttest_must_fail git rev-parse --verify :2:a2 &&\n     + \tgit rev-parse --verify :3:a2\n     +-\n     + '\n     + \n     + test_done\n\n-- \ngitgitgadget\n"},{"id":"385505","messageId":"0aaf1799e05e1f942d0a09888c008e7e4b73a8ce.1573004049.git.gitgitgadget@gmail.com","threadId":"52198","inReplyTo":"pull.455.v2.git.1573004049.gitgitgadget@gmail.com","subject":"[PATCH v2 1/1] t6024: modernize style","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-06T01:34:09Z","receivedAt":"2019-11-06T01:34:17Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nNo substantive changes, just a few cosmetic changes:\n  * Indent steps of an individual test\n  * Don't have logic between the \"test_expect_success\" blocks that\n    the next block will depend upon, move it into the\n    test_expect_success section itself\n  * Fix spacing around redirection operators to match git style\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n t/t6024-recursive-merge.sh | 130 +++++++++++++++++++------------------\n 1 file changed, 67 insertions(+), 63 deletions(-)\n\ndiff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh\nindex 27c7de90ce..0c9e3c20e8 100755\n--- a/t/t6024-recursive-merge.sh\n+++ b/t/t6024-recursive-merge.sh\n@@ -14,85 +14,90 @@ test_description='Test merge without common ancestors'\n GIT_COMMITTER_DATE=\"2006-12-12 23:28:00 +0100\"\n export GIT_COMMITTER_DATE\n \n-test_expect_success \"setup tests\" '\n-echo 1 > a1 &&\n-git add a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n-\n-git checkout -b A master &&\n-echo A > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:01\" git commit -m A a1 &&\n-\n-git checkout -b B master &&\n-echo B > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:02\" git commit -m B a1 &&\n-\n-git checkout -b D A &&\n-git rev-parse B > .git/MERGE_HEAD &&\n-echo D > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:03\" git commit -m D &&\n-\n-git symbolic-ref HEAD refs/heads/other &&\n-echo 2 > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:04\" git commit -m 2 a1 &&\n-\n-git checkout -b C &&\n-echo C > a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:05\" git commit -m C a1 &&\n-\n-git checkout -b E C &&\n-git rev-parse B > .git/MERGE_HEAD &&\n-echo E > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:06\" git commit -m E &&\n-\n-git checkout -b G E &&\n-git rev-parse A > .git/MERGE_HEAD &&\n-echo G > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:07\" git commit -m G &&\n-\n-git checkout -b F D &&\n-git rev-parse C > .git/MERGE_HEAD &&\n-echo F > a1 &&\n-git update-index a1 &&\n-GIT_AUTHOR_DATE=\"2006-12-12 23:00:08\" git commit -m F\n+test_expect_success 'setup tests' '\n+\techo 1 >a1 &&\n+\tgit add a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:00\" git commit -m 1 a1 &&\n+\n+\tgit checkout -b A master &&\n+\techo A >a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:01\" git commit -m A a1 &&\n+\n+\tgit checkout -b B master &&\n+\techo B >a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:02\" git commit -m B a1 &&\n+\n+\tgit checkout -b D A &&\n+\tgit rev-parse B >.git/MERGE_HEAD &&\n+\techo D >a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:03\" git commit -m D &&\n+\n+\tgit symbolic-ref HEAD refs/heads/other &&\n+\techo 2 >a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:04\" git commit -m 2 a1 &&\n+\n+\tgit checkout -b C &&\n+\techo C >a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:05\" git commit -m C a1 &&\n+\n+\tgit checkout -b E C &&\n+\tgit rev-parse B >.git/MERGE_HEAD &&\n+\techo E >a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:06\" git commit -m E &&\n+\n+\tgit checkout -b G E &&\n+\tgit rev-parse A >.git/MERGE_HEAD &&\n+\techo G >a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:07\" git commit -m G &&\n+\n+\tgit checkout -b F D &&\n+\tgit rev-parse C >.git/MERGE_HEAD &&\n+\techo F >a1 &&\n+\tgit update-index a1 &&\n+\tGIT_AUTHOR_DATE=\"2006-12-12 23:00:08\" git commit -m F\n '\n \n test_expect_success 'combined merge conflicts' '\n \ttest_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G\n '\n \n-cat > expect << EOF\n-<<<<<<< HEAD\n-F\n-=======\n-G\n->>>>>>> G\n-EOF\n+test_expect_success 'result contains a conflict' '\n+\tcat >expect <<-\\EOF &&\n+\t<<<<<<< HEAD\n+\tF\n+\t=======\n+\tG\n+\t>>>>>>> G\n+\tEOF\n \n-test_expect_success \"result contains a conflict\" \"test_cmp expect a1\"\n+\ttest_cmp expect a1\n+'\n+\n+test_expect_success 'virtual trees were processed' '\n+\tgit ls-files --stage >out &&\n \n-git ls-files --stage > out\n-cat > expect << EOF\n-100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n-100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n-100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n-EOF\n+\tcat >expect <<-\\EOF &&\n+\t100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1\ta1\n+\t100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2\ta1\n+\t100644 fd7923529855d0b274795ae3349c5e0438333979 3\ta1\n+\tEOF\n \n-test_expect_success \"virtual trees were processed\" \"test_cmp expect out\"\n+\ttest_cmp expect out\n+'\n \n test_expect_success 'refuse to merge binary files' '\n \tgit reset --hard &&\n-\tprintf \"\\0\" > binary-file &&\n+\tprintf \"\\0\" >binary-file &&\n \tgit add binary-file &&\n \tgit commit -m binary &&\n \tgit checkout G &&\n-\tprintf \"\\0\\0\" > binary-file &&\n+\tprintf \"\\0\\0\" >binary-file &&\n \tgit add binary-file &&\n \tgit commit -m binary2 &&\n-\ttest_must_fail git merge F > merge.out 2> merge.err &&\n+\ttest_must_fail git merge F >merge.out 2>merge.err &&\n \tgrep \"Cannot merge binary files: binary-file (HEAD vs. F)\" merge.err\n '\n \n@@ -116,7 +121,6 @@ test_expect_success 'mark rename/delete as unmerged' '\n \ttest 1 = $(git ls-files --unmerged | wc -l) &&\n \ttest_must_fail git rev-parse --verify :2:a2 &&\n \tgit rev-parse --verify :3:a2\n-\n '\n \n test_done\n-- \ngitgitgadget\n"},{"id":"385659","messageId":"xmqqsgn0qm0y.fsf@gitster-ct.c.googlers.com","threadId":"52198","inReplyTo":"0aaf1799e05e1f942d0a09888c008e7e4b73a8ce.1573004049.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 1/1] t6024: modernize style","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-07T05:43:25Z","receivedAt":"2019-11-07T05:43:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Elijah Newren via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Elijah Newren <newren@gmail.com>\n>\n> No substantive changes, just a few cosmetic changes:\n>   * Indent steps of an individual test\n>   * Don't have logic between the \"test_expect_success\" blocks that\n>     the next block will depend upon, move it into the\n>     test_expect_success section itself\n>   * Fix spacing around redirection operators to match git style\n>\n> Signed-off-by: Elijah Newren <newren@gmail.com>\n> ---\n>  t/t6024-recursive-merge.sh | 130 +++++++++++++++++++------------------\n>  1 file changed, 67 insertions(+), 63 deletions(-)\n\n\"git show -w\" looked good.   Thanks.\n"}]}