[1/1] t6024: modernize style

Commit Message

John Passaro via GitGitGadget Nov. 5, 2019, 11:58 p.m. UTC

From: Elijah Newren <[e-mail]>

No substantive changes, just a few cosmetic changes:
  * Indent steps of an individual test
  * Don't have logic between the "test_expect_success" blocks that
    the next block will depend upon, move it into the
    test_expect_success section itself
  * Fix spacing around redirection operators to match git style

Signed-off-by: Elijah Newren <[e-mail]>
---
 t/t6024-recursive-merge.sh | 121 +++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 59 deletions(-)

Comments

Eric Sunshine Nov. 6, 2019, 12:11 a.m. UTC | #1

On Tue, Nov 5, 2019 at 6:58 PM Elijah Newren via GitGitGadget
<[e-mail]> wrote:
> No substantive changes, just a few cosmetic changes:
>   * Indent steps of an individual test
>   * Don't have logic between the "test_expect_success" blocks that
>     the next block will depend upon, move it into the
>     test_expect_success section itself
>   * Fix spacing around redirection operators to match git style
>
> Signed-off-by: Elijah Newren <[e-mail]>
> ---
> diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
> @@ -15,73 +15,76 @@ GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
>  test_expect_success "setup tests" '

Since you're modernizing, perhaps use single quotes around the test
title rather than double quotes. Same comment applies to other test
titles.

> +       echo 1 > a1 &&

The commit message talks about fixing spacing around redirection
operators but neither this instance nor any of the others in this
function have been fixed.

> +       git add a1 &&
> +       GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
> +       ...
>  '
> +       cat >expect <<-EOF &&

Since there's no interpolation going on inside the here-doc, perhaps
use -\EOF instead. Same comment applies to other here-docs.

> +               <<<<<<< HEAD
> +               F
> +               =======
> +               G
> +               >>>>>>> G
> +               EOF

Custom in most scripts is to indent the here-doc body only as far as
the command which opens it (that is, give it the same indentation as
the 'cat' command). Same comment applies to other here-docs.

Patch

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 27c7de90ce..0cc876360c 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -15,73 +15,76 @@  GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
 export GIT_COMMITTER_DATE
 
 test_expect_success "setup tests" '
-echo 1 > a1 &&
-git add a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
-
-git checkout -b A master &&
-echo A > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
-
-git checkout -b B master &&
-echo B > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
-
-git checkout -b D A &&
-git rev-parse B > .git/MERGE_HEAD &&
-echo D > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
-
-git symbolic-ref HEAD refs/heads/other &&
-echo 2 > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
-
-git checkout -b C &&
-echo C > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
-
-git checkout -b E C &&
-git rev-parse B > .git/MERGE_HEAD &&
-echo E > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
-
-git checkout -b G E &&
-git rev-parse A > .git/MERGE_HEAD &&
-echo G > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
-
-git checkout -b F D &&
-git rev-parse C > .git/MERGE_HEAD &&
-echo F > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
+	echo 1 > a1 &&
+	git add a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+
+	git checkout -b A master &&
+	echo A > a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+
+	git checkout -b B master &&
+	echo B > a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+
+	git checkout -b D A &&
+	git rev-parse B > .git/MERGE_HEAD &&
+	echo D > a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 > a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+	git checkout -b C &&
+	echo C > a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+
+	git checkout -b E C &&
+	git rev-parse B > .git/MERGE_HEAD &&
+	echo E > a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+
+	git checkout -b G E &&
+	git rev-parse A > .git/MERGE_HEAD &&
+	echo G > a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+
+	git checkout -b F D &&
+	git rev-parse C > .git/MERGE_HEAD &&
+	echo F > a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
 '
 
 test_expect_success 'combined merge conflicts' '
 	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
 '
 
-cat > expect << EOF
-<<<<<<< HEAD
-F
-=======
-G
->>>>>>> G
-EOF
+test_expect_success "result contains a conflict" '
+	cat >expect <<-EOF &&
+		<<<<<<< HEAD
+		F
+		=======
+		G
+		>>>>>>> G
+		EOF
 
-test_expect_success "result contains a conflict" "test_cmp expect a1"
-
-git ls-files --stage > out
-cat > expect << EOF
-100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1	a1
-100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2	a1
-100644 fd7923529855d0b274795ae3349c5e0438333979 3	a1
-EOF
+	test_cmp expect a1
+'
 
-test_expect_success "virtual trees were processed" "test_cmp expect out"
+test_expect_success "virtual trees were processed" '
+	git ls-files --stage >out &&
+	cat >expect <<-EOF &&
+		100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1	a1
+		100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2	a1
+		100644 fd7923529855d0b274795ae3349c5e0438333979 3	a1
+		EOF
+	test_cmp expect out
+'
 
 test_expect_success 'refuse to merge binary files' '
 	git reset --hard &&