[PATCH v2 0/1] t6024: modernize style
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Nov 6, 2019, 01:34 UTC
- Message-ID
- <pull.455.v2.git.1573004049.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.455.git.1572998303.gitgitgadget@gmail.com>
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