* [GSoC PATCH 1/2] t8003: avoid suppressing git's exit code
@ 2026-03-28 13:29 Trieu Huynh
2026-03-28 13:29 ` [GSoC PATCH 2/2] t8003: modernise style Trieu Huynh
0 siblings, 1 reply; 2+ messages in thread
From: Trieu Huynh @ 2026-03-28 13:29 UTC (permalink / raw)
To: git; +Cc: Trieu Huynh
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>
---
t/t8003-blame-corner-cases.sh | 48 ++++++++++++++++++++++-------------
1 file 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' '
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* [GSoC PATCH 2/2] t8003: modernise style
2026-03-28 13:29 [GSoC PATCH 1/2] t8003: avoid suppressing git's exit code Trieu Huynh
@ 2026-03-28 13:29 ` Trieu Huynh
0 siblings, 0 replies; 2+ messages in thread
From: Trieu Huynh @ 2026-03-28 13:29 UTC (permalink / raw)
To: git; +Cc: Trieu Huynh
Remove the blank lines at both ends of each test_expect_success body
to match the modern style used elsewhere in the test suite.
Signed-off-by: Trieu Huynh <vikingtc4@gmail.com>
---
t/t8003-blame-corner-cases.sh | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 17ed5af121..30e7960ace 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -49,77 +49,56 @@ test_expect_success setup '
'
test_expect_success 'straight copy without -C' '
-
git blame uno >actual &&
test_grep Second actual
-
'
test_expect_success 'straight move without -C' '
-
git blame dos >actual &&
test_grep Initial actual
-
'
test_expect_success 'straight copy with -C' '
-
git blame -C1 uno >actual &&
test_grep Second actual
-
'
test_expect_success 'straight move with -C' '
-
git blame -C1 dos >actual &&
test_grep Initial actual
-
'
test_expect_success 'straight copy with -C -C' '
-
git blame -C -C1 uno >actual &&
test_grep Initial actual
-
'
test_expect_success 'straight move with -C -C' '
-
git blame -C -C1 dos >actual &&
test_grep Initial actual
-
'
test_expect_success 'append without -C' '
-
git blame -L2 tres >actual &&
test_grep Second actual
-
'
test_expect_success 'append with -C' '
-
git blame -L2 -C1 tres >actual &&
test_grep Second actual
-
'
test_expect_success 'append with -C -C' '
-
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 >actual &&
test_grep Initial actual
-
'
test_expect_success 'blame wholesale copy' '
-
git blame -f -C -C1 HEAD^ -- cow >actual &&
sed -e "$pick_fc" actual >current &&
cat >expected <<-\EOF &&
@@ -128,11 +107,9 @@ test_expect_success 'blame wholesale copy' '
mouse-Third
EOF
test_cmp expected current
-
'
test_expect_success 'blame wholesale copy and more' '
-
git blame -f -C -C1 HEAD -- cow >actual &&
sed -e "$pick_fc" actual >current &&
cat >expected <<-\EOF &&
@@ -142,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
@@ -166,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 &&
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-28 13:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-28 13:29 [GSoC PATCH 1/2] t8003: avoid suppressing git's exit code Trieu Huynh
2026-03-28 13:29 ` [GSoC PATCH 2/2] t8003: modernise style Trieu Huynh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox