undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/t6024-style'

Browse Source 
Test updates.

* en/t6024-style:
  t6024: modernize style
This commit is contained in:
Junio C Hamano 2019-12-01 09:04:34 -08:00
commit ffd130a363
1 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/t6024-recursive-merge.sh
View File

@ -14,7 +14,7 @@ test_description='Test merge without common ancestors'
GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100" GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
export GIT_COMMITTER_DATE export GIT_COMMITTER_DATE
test_expect_success "setup tests" ' test_expect_success 'setup tests' '
echo 1 >a1 && echo 1 >a1 &&
git add a1 && git add a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 && GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
@ -64,7 +64,8 @@ test_expect_success 'combined merge conflicts' '
test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
' '
cat > expect << EOF test_expect_success 'result contains a conflict' '
cat >expect <<-\EOF &&
<<<<<<< HEAD <<<<<<< HEAD
F F
======= =======
@ -72,16 +73,20 @@ G
>>>>>>> G >>>>>>> G
EOF EOF
test_expect_success "result contains a conflict" "test_cmp expect a1" test_cmp expect a1
'
git ls-files --stage > out test_expect_success 'virtual trees were processed' '
cat > expect << EOF git ls-files --stage >out &&
cat >expect <<-\EOF &&
100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1 100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1
100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF EOF
test_expect_success "virtual trees were processed" "test_cmp expect out" test_cmp expect out
'
test_expect_success 'refuse to merge binary files' ' test_expect_success 'refuse to merge binary files' '
git reset --hard && git reset --hard &&
@ -116,7 +121,6 @@ test_expect_success 'mark rename/delete as unmerged' '
test 1 = $(git ls-files --unmerged | wc -l) && test 1 = $(git ls-files --unmerged | wc -l) &&
test_must_fail git rev-parse --verify :2:a2 && test_must_fail git rev-parse --verify :2:a2 &&
git rev-parse --verify :3:a2 git rev-parse --verify :3:a2
' '
test_done test_done