kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'th/t8003-unhide-git-failures' 

Test clean-up.

* th/t8003-unhide-git-failures:
  t8003: modernise style
  t8003: avoid suppressing git's exit code
maint
Junio C Hamano 2026-04-03 13:01:09 -07:00
parent e0613d24f9 699248d89e
commit fed877c9e1
1 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
t/t8003-blame-corner-cases.sh
View File

@ -49,80 +49,69 @@ test_expect_success setup '
'

test_expect_success 'straight copy without -C' '

git blame uno | grep Second

git blame uno >actual &&
test_grep Second actual
'

test_expect_success 'straight move without -C' '

git blame dos | grep Initial

git blame dos >actual &&
test_grep Initial actual
'

test_expect_success 'straight copy with -C' '

git blame -C1 uno | grep Second

git blame -C1 uno >actual &&
test_grep Second actual
'

test_expect_success 'straight move with -C' '

git blame -C1 dos | grep Initial

git blame -C1 dos >actual &&
test_grep Initial actual
'

test_expect_success 'straight copy with -C -C' '

git blame -C -C1 uno | grep Initial

git blame -C -C1 uno >actual &&
test_grep Initial actual
'

test_expect_success 'straight move with -C -C' '

git blame -C -C1 dos | grep Initial

git blame -C -C1 dos >actual &&
test_grep Initial actual
'

test_expect_success 'append without -C' '

git blame -L2 tres | grep Second

git blame -L2 tres >actual &&
test_grep Second actual
'

test_expect_success 'append with -C' '

git blame -L2 -C1 tres | grep Second

git blame -L2 -C1 tres >actual &&
test_grep Second actual
'

test_expect_success 'append with -C -C' '

git blame -L2 -C -C1 tres | grep Second

git blame -L2 -C -C1 tres >actual &&
test_grep Second actual
'

test_expect_success 'append with -C -C -C' '

git blame -L2 -C -C -C1 tres | grep Initial

git blame -L2 -C -C -C1 tres >actual &&
test_grep Initial actual
'

test_expect_success 'blame wholesale copy' '

git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
git blame -f -C -C1 HEAD^ -- cow >actual &&
sed -e "$pick_fc" actual >current &&
cat >expected <<-\EOF &&
mouse-Initial
mouse-Second
mouse-Third
EOF
test_cmp expected current

'

test_expect_success 'blame wholesale copy and more' '

git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
git blame -f -C -C1 HEAD -- cow >actual &&
sed -e "$pick_fc" actual >current &&
cat >expected <<-\EOF &&
mouse-Initial
mouse-Second
@ -130,11 +119,9 @@ test_expect_success 'blame wholesale copy and more' '
mouse-Third
EOF
test_cmp expected current

'

test_expect_success 'blame wholesale copy and more in the index' '

cat >horse <<-\EOF &&
ABC
DEF
@ -144,7 +131,8 @@ test_expect_success 'blame wholesale copy and more in the index' '
EOF
git add horse &&
test_when_finished "git rm -f horse" &&
git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
git blame -f -C -C1 -- horse >actual &&
sed -e "$pick_fc" actual >current &&
cat >expected <<-\EOF &&
mouse-Initial
mouse-Second
@ -153,11 +141,9 @@ test_expect_success 'blame wholesale copy and more in the index' '
mouse-Third
EOF
test_cmp expected current

'

test_expect_success 'blame during cherry-pick with file rename conflict' '

test_when_finished "git reset --hard && git checkout main" &&
git checkout HEAD~3 &&
echo MOUSE >> mouse &&
@ -168,7 +154,8 @@ test_expect_success 'blame during cherry-pick with file rename conflict' '
(git cherry-pick HEAD@{1} || test $? -eq 1) &&
git show HEAD@{1}:rodent > rodent &&
git add rodent &&
git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
git blame -f -C -C1 rodent >actual &&
sed -e "$pick_fc" actual >current &&
cat >expected <<-\EOF &&
mouse-Initial
mouse-Second
@ -246,14 +233,14 @@ test_expect_success 'setup file with CRLF newlines' '
test_expect_success 'blame file with CRLF core.autocrlf true' '
git config core.autocrlf true &&
git blame crlffile >actual &&
grep "A U Thor" actual
test_grep "A U Thor" actual
'

test_expect_success 'blame file with CRLF attributes text' '
git config core.autocrlf false &&
echo "crlffile text" >.gitattributes &&
git blame crlffile >actual &&
grep "A U Thor" actual
test_grep "A U Thor" actual
'

test_expect_success 'blame file with CRLF core.autocrlf=true' '
@ -267,7 +254,7 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' '
git checkout crlfinrepo &&
rm tmp &&
git blame crlfinrepo >actual &&
grep "A U Thor" actual
test_grep "A U Thor" actual
'

test_expect_success 'setup coalesce tests' '