* [PATCH 0/1] t6024: modernize style
@ 2019-11-05 23:58 Elijah Newren via GitGitGadget
2019-11-05 23:58 ` [PATCH 1/1] " Elijah Newren via GitGitGadget
2019-11-06 1:34 ` [PATCH v2 0/1] " Elijah Newren via GitGitGadget
0 siblings, 2 replies; 6+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-11-05 23:58 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
A simple patch to modernize t6024; this was a change I made a few months ago
that I apparently forgot; found while cleaning out old branches.
Elijah Newren (1):
t6024: modernize style
t/t6024-recursive-merge.sh | 121 +++++++++++++++++++------------------
1 file changed, 62 insertions(+), 59 deletions(-)
base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-455%2Fnewren%2Ft6024-test-modernization-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-455/newren/t6024-test-modernization-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/455
--
gitgitgadget
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] t6024: modernize style
2019-11-05 23:58 [PATCH 0/1] t6024: modernize style Elijah Newren via GitGitGadget
@ 2019-11-05 23:58 ` Elijah Newren via GitGitGadget
2019-11-06 0:11 ` Eric Sunshine
2019-11-06 1:34 ` [PATCH v2 0/1] " Elijah Newren via GitGitGadget
1 sibling, 1 reply; 6+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-11-05 23:58 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Elijah Newren
From: Elijah Newren <newren@gmail.com>
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 <newren@gmail.com>
---
t/t6024-recursive-merge.sh | 121 +++++++++++++++++++------------------
1 file changed, 62 insertions(+), 59 deletions(-)
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 &&
--
gitgitgadget
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] t6024: modernize style
2019-11-05 23:58 ` [PATCH 1/1] " Elijah Newren via GitGitGadget
@ 2019-11-06 0:11 ` Eric Sunshine
0 siblings, 0 replies; 6+ messages in thread
From: Eric Sunshine @ 2019-11-06 0:11 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: Git List, Junio C Hamano, Elijah Newren
On Tue, Nov 5, 2019 at 6:58 PM Elijah Newren via GitGitGadget
<gitgitgadget@gmail.com> 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 <newren@gmail.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 0/1] t6024: modernize style
2019-11-05 23:58 [PATCH 0/1] t6024: modernize style Elijah Newren via GitGitGadget
2019-11-05 23:58 ` [PATCH 1/1] " Elijah Newren via GitGitGadget
@ 2019-11-06 1:34 ` Elijah Newren via GitGitGadget
2019-11-06 1:34 ` [PATCH v2 1/1] " Elijah Newren via GitGitGadget
1 sibling, 1 reply; 6+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-11-06 1:34 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
A simple patch to modernize t6024; this was a change I made a few months ago
that I apparently forgot; found while cleaning out old branches.
Changes since v1:
* Addressed feedback from Eric.
Elijah Newren (1):
t6024: modernize style
t/t6024-recursive-merge.sh | 130 +++++++++++++++++++------------------
1 file changed, 67 insertions(+), 63 deletions(-)
base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-455%2Fnewren%2Ft6024-test-modernization-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-455/newren/t6024-test-modernization-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/455
Range-diff vs v1:
1: c6349cdbd0 ! 1: 0aaf1799e0 t6024: modernize style
@@ -15,9 +15,10 @@
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@
+ GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
export GIT_COMMITTER_DATE
- test_expect_success "setup tests" '
+-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 &&
@@ -61,47 +62,48 @@
-echo F > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
-+ echo 1 > a1 &&
++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 &&
++ 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 &&
++ 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 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 &&
++ echo 2 >a1 &&
+ GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+ git checkout -b C &&
-+ echo C > a1 &&
++ 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 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 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 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
'
@@ -117,36 +119,59 @@
-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' '
++ cat >expect <<-\EOF &&
++ <<<<<<< HEAD
++ F
++ =======
++ G
++ >>>>>>> G
++ EOF
-test_expect_success "result contains a conflict" "test_cmp expect a1"
--
++ test_cmp expect a1
++'
++
++test_expect_success 'virtual trees were processed' '
++ git ls-files --stage >out &&
+
-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
-+'
++ cat >expect <<-\EOF &&
++ 100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1
++ 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
++ 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
++ EOF
-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 &&
+- printf "\0" > binary-file &&
++ printf "\0" >binary-file &&
+ git add binary-file &&
+ git commit -m binary &&
+ git checkout G &&
+- printf "\0\0" > binary-file &&
++ printf "\0\0" >binary-file &&
+ git add binary-file &&
+ git commit -m binary2 &&
+- test_must_fail git merge F > merge.out 2> merge.err &&
++ test_must_fail git merge F >merge.out 2>merge.err &&
+ grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
+ '
+
+@@
+ test 1 = $(git ls-files --unmerged | wc -l) &&
+ test_must_fail git rev-parse --verify :2:a2 &&
+ git rev-parse --verify :3:a2
+-
+ '
+
+ test_done
--
gitgitgadget
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/1] t6024: modernize style
2019-11-06 1:34 ` [PATCH v2 0/1] " Elijah Newren via GitGitGadget
@ 2019-11-06 1:34 ` Elijah Newren via GitGitGadget
2019-11-07 5:43 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Elijah Newren via GitGitGadget @ 2019-11-06 1:34 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Elijah Newren
From: Elijah Newren <newren@gmail.com>
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 <newren@gmail.com>
---
t/t6024-recursive-merge.sh | 130 +++++++++++++++++++------------------
1 file changed, 67 insertions(+), 63 deletions(-)
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 27c7de90ce..0c9e3c20e8 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -14,85 +14,90 @@ test_description='Test merge without common ancestors'
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
+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
'
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"
+ test_cmp expect a1
+'
+
+test_expect_success 'virtual trees were processed' '
+ git ls-files --stage >out &&
-git ls-files --stage > out
-cat > expect << EOF
-100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1
-100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
-100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
-EOF
+ cat >expect <<-\EOF &&
+ 100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1
+ 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
+ 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
+ EOF
-test_expect_success "virtual trees were processed" "test_cmp expect out"
+ test_cmp expect out
+'
test_expect_success 'refuse to merge binary files' '
git reset --hard &&
- printf "\0" > binary-file &&
+ printf "\0" >binary-file &&
git add binary-file &&
git commit -m binary &&
git checkout G &&
- printf "\0\0" > binary-file &&
+ printf "\0\0" >binary-file &&
git add binary-file &&
git commit -m binary2 &&
- test_must_fail git merge F > merge.out 2> merge.err &&
+ test_must_fail git merge F >merge.out 2>merge.err &&
grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
'
@@ -116,7 +121,6 @@ test_expect_success 'mark rename/delete as unmerged' '
test 1 = $(git ls-files --unmerged | wc -l) &&
test_must_fail git rev-parse --verify :2:a2 &&
git rev-parse --verify :3:a2
-
'
test_done
--
gitgitgadget
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/1] t6024: modernize style
2019-11-06 1:34 ` [PATCH v2 1/1] " Elijah Newren via GitGitGadget
@ 2019-11-07 5:43 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2019-11-07 5:43 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Elijah Newren <newren@gmail.com>
>
> 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 <newren@gmail.com>
> ---
> t/t6024-recursive-merge.sh | 130 +++++++++++++++++++------------------
> 1 file changed, 67 insertions(+), 63 deletions(-)
"git show -w" looked good. Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-07 5:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05 23:58 [PATCH 0/1] t6024: modernize style Elijah Newren via GitGitGadget
2019-11-05 23:58 ` [PATCH 1/1] " Elijah Newren via GitGitGadget
2019-11-06 0:11 ` Eric Sunshine
2019-11-06 1:34 ` [PATCH v2 0/1] " Elijah Newren via GitGitGadget
2019-11-06 1:34 ` [PATCH v2 1/1] " Elijah Newren via GitGitGadget
2019-11-07 5:43 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).