aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorTrieu Huynh <vikingtc4@gmail.com>2026-03-28 22:29:54 +0900
committerJunio C Hamano <gitster@pobox.com>2026-03-28 11:37:07 -0700
commit206ca04c8669ddf5aa75c162dd97d8e1c499cda9 (patch)
treeacb836d205884490acbcd2555bb4b687186a70c7 /t
parent67ad42147a7acc2af6074753ebd03d904476118f (diff)
downloadgit-206ca04c8669ddf5aa75c162dd97d8e1c499cda9.tar.xz
t8003: avoid suppressing git's exit code
Update t8003-blame-corner-cases.sh to redirect git-blame output to a temporary file instead of piping it directly to not hide the exit code of git commands behind pipes, as a crash in git might go unnoticed. Signed-off-by: Trieu Huynh <vikingtc4@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t8003-blame-corner-cases.sh48
1 files changed, 31 insertions, 17 deletions
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 731265541a..17ed5af121 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -50,67 +50,78 @@ 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
@@ -122,7 +133,8 @@ test_expect_success 'blame wholesale copy' '
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
@@ -144,7 +156,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
@@ -168,7 +181,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 +260,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 +281,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' '