From fc2ead0053d31735ac4a02c370c5c2b6dbaf2bbe Mon Sep 17 00:00:00 2001 From: Siddharth Shrimali Date: Wed, 4 Mar 2026 02:10:28 +0530 Subject: [PATCH 1/2] t3700: avoid suppressing git's exit code Replace pipelines involving git commands with temporary files (actual) to ensure that any crashes or unexpected exit codes from the git commands are properly caught by the test suite. A simple pipeline like 'git foo | grep bar' ignores the exit code of 'git', which can hide regressions. In cases where we were counting lines with 'wc -l' to ensure a pattern was absent, simplify the logic to use '! grep' to avoid subshells entirely. Suggested-by: Junio C Hamano Signed-off-by: Siddharth Shrimali Signed-off-by: Junio C Hamano --- t/t3700-add.sh | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index af93e53c12..c9ce2f758c 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -38,7 +38,8 @@ test_expect_success 'Test with no pathspecs' ' ' test_expect_success 'Post-check that foo is in the index' ' - git ls-files foo | grep foo + git ls-files foo >actual && + grep foo actual ' test_expect_success 'Test that "git add -- -q" works' ' @@ -195,8 +196,9 @@ test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' echo new > file && echo new > symlink && git add file symlink && - git ls-files --stage | grep "^100755 .* 0 file$" && - git ls-files --stage | grep "^120000 .* 0 symlink$" + git ls-files --stage >actual && + grep "^100755 .* 0 file$" actual && + grep "^120000 .* 0 symlink$" actual ' test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' ' @@ -212,8 +214,9 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st echo new > file && echo new > symlink && git add file symlink && - git ls-files --stage | grep "^100755 .* 0 file$" && - git ls-files --stage | grep "^120000 .* 0 symlink$" + git ls-files --stage >actual && + grep "^100755 .* 0 file$" actual && + grep "^120000 .* 0 symlink$" actual ' test_expect_success 'git add --refresh' ' @@ -254,7 +257,8 @@ test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unr date >foo2 && chmod 0 foo2 && test_must_fail git add --verbose . && - ! ( git ls-files foo1 | grep foo1 ) + git ls-files foo1 >actual && + ! grep foo1 actual ' rm -f foo2 @@ -265,7 +269,8 @@ test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' ' date >foo2 && chmod 0 foo2 && test_must_fail git add --verbose --ignore-errors . && - git ls-files foo1 | grep foo1 + git ls-files foo1 >actual && + grep foo1 actual ' rm -f foo2 @@ -277,7 +282,8 @@ test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' ' date >foo2 && chmod 0 foo2 && test_must_fail git add --verbose . && - git ls-files foo1 | grep foo1 + git ls-files foo1 >actual && + grep foo1 actual ' rm -f foo2 @@ -288,7 +294,8 @@ test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' ' date >foo2 && chmod 0 foo2 && test_must_fail git add --verbose . && - ! ( git ls-files foo1 | grep foo1 ) + git ls-files foo1 >actual && + ! grep foo1 actual ' rm -f foo2 @@ -299,7 +306,8 @@ test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' ' date >foo2 && chmod 0 foo2 && test_must_fail git add --verbose --no-ignore-errors . && - ! ( git ls-files foo1 | grep foo1 ) && + git ls-files foo1 >actual && + ! grep foo1 actual && git config add.ignore-errors 0 ' rm -f foo2 @@ -308,8 +316,10 @@ test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" ' git reset --hard && touch fo\[ou\]bar foobar && git add '\''fo\[ou\]bar'\'' && - git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar && - ! ( git ls-files foobar | grep foobar ) + git ls-files fo\[ou\]bar >actual && + grep -F fo\[ou\]bar actual && + git ls-files foobar >actual && + ! grep foobar actual ' test_expect_success 'git add to resolve conflicts on otherwise ignored path' ' @@ -326,7 +336,8 @@ test_expect_success 'git add to resolve conflicts on otherwise ignored path' ' test_expect_success '"add non-existent" should fail' ' test_must_fail git add non-existent && - ! (git ls-files | grep "non-existent") + git ls-files >actual && + ! grep "non-existent" actual ' test_expect_success 'git add -A on empty repo does not error out' ' @@ -536,9 +547,11 @@ test_expect_success 'all statuses changed in folder if . is given' ' touch x y z sub/a sub/dir/b && git add -A && git add --chmod=+x . && - test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 && + git ls-files --stage >actual && + ! grep ^100644 actual && git add --chmod=-x . && - test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0 + git ls-files --stage >actual && + ! grep ^100755 actual ) ' From 0d6bb8b541b0bd049599c29711e2c75ca5f17b07 Mon Sep 17 00:00:00 2001 From: Siddharth Shrimali Date: Wed, 4 Mar 2026 02:10:29 +0530 Subject: [PATCH 2/2] t3700: use test_grep helper for better diagnostics Replace 'grep' and '! grep' invocations with 'test_grep' and 'test_grep !'. This provides better debugging output if tests fail in the future, as 'test_grep' will automatically print the contents of the file when a check fails. While at it, update any remaining instances of 'grep' to 'test_grep' that were missed in the previous versions to ensure that the entire file is consistent with modern project style. Suggested-by: Junio C Hamano Signed-off-by: Siddharth Shrimali Signed-off-by: Junio C Hamano --- t/t3700-add.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index c9ce2f758c..2947bf9a6b 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -39,7 +39,7 @@ test_expect_success 'Test with no pathspecs' ' test_expect_success 'Post-check that foo is in the index' ' git ls-files foo >actual && - grep foo actual + test_grep foo actual ' test_expect_success 'Test that "git add -- -q" works' ' @@ -141,7 +141,7 @@ test_expect_success 'error out when attempting to add ignored ones but add other git ls-files >files && sed -n "/\\.ig/p" actual && test_must_be_empty actual && - grep a.if files + test_grep a.if files ' test_expect_success 'add ignored ones with -f' ' @@ -197,8 +197,8 @@ test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' echo new > symlink && git add file symlink && git ls-files --stage >actual && - grep "^100755 .* 0 file$" actual && - grep "^120000 .* 0 symlink$" actual + test_grep "^100755 .* 0 file$" actual && + test_grep "^120000 .* 0 symlink$" actual ' test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' ' @@ -215,8 +215,8 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st echo new > symlink && git add file symlink && git ls-files --stage >actual && - grep "^100755 .* 0 file$" actual && - grep "^120000 .* 0 symlink$" actual + test_grep "^100755 .* 0 file$" actual && + test_grep "^120000 .* 0 symlink$" actual ' test_expect_success 'git add --refresh' ' @@ -241,8 +241,8 @@ test_expect_success 'git add --refresh with pathspec' ' test_must_be_empty actual && git diff-files --name-only >actual && - ! grep bar actual && - grep baz actual + test_grep ! bar actual && + test_grep baz actual ' test_expect_success 'git add --refresh correctly reports no match error' " @@ -258,7 +258,7 @@ test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unr chmod 0 foo2 && test_must_fail git add --verbose . && git ls-files foo1 >actual && - ! grep foo1 actual + test_grep ! foo1 actual ' rm -f foo2 @@ -270,7 +270,7 @@ test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' ' chmod 0 foo2 && test_must_fail git add --verbose --ignore-errors . && git ls-files foo1 >actual && - grep foo1 actual + test_grep foo1 actual ' rm -f foo2 @@ -283,7 +283,7 @@ test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' ' chmod 0 foo2 && test_must_fail git add --verbose . && git ls-files foo1 >actual && - grep foo1 actual + test_grep foo1 actual ' rm -f foo2 @@ -295,7 +295,7 @@ test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' ' chmod 0 foo2 && test_must_fail git add --verbose . && git ls-files foo1 >actual && - ! grep foo1 actual + test_grep ! foo1 actual ' rm -f foo2 @@ -307,7 +307,7 @@ test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' ' chmod 0 foo2 && test_must_fail git add --verbose --no-ignore-errors . && git ls-files foo1 >actual && - ! grep foo1 actual && + test_grep ! foo1 actual && git config add.ignore-errors 0 ' rm -f foo2 @@ -317,9 +317,9 @@ test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" ' touch fo\[ou\]bar foobar && git add '\''fo\[ou\]bar'\'' && git ls-files fo\[ou\]bar >actual && - grep -F fo\[ou\]bar actual && + test_grep -F fo\[ou\]bar actual && git ls-files foobar >actual && - ! grep foobar actual + test_grep ! foobar actual ' test_expect_success 'git add to resolve conflicts on otherwise ignored path' ' @@ -337,7 +337,7 @@ test_expect_success 'git add to resolve conflicts on otherwise ignored path' ' test_expect_success '"add non-existent" should fail' ' test_must_fail git add non-existent && git ls-files >actual && - ! grep "non-existent" actual + test_grep ! "non-existent" actual ' test_expect_success 'git add -A on empty repo does not error out' ' @@ -548,10 +548,10 @@ test_expect_success 'all statuses changed in folder if . is given' ' git add -A && git add --chmod=+x . && git ls-files --stage >actual && - ! grep ^100644 actual && + test_grep ! ^100644 actual && git add --chmod=-x . && git ls-files --stage >actual && - ! grep ^100755 actual + test_grep ! ^100755 actual ) '