[PATCH GSoC v2] t2203: avoid masking exit codes in git status
- From
Tian Yuchen <a3205153416@gmail.com>
- Date
- Jan 18, 2026, 04:35 UTC
- Message-ID
- <20260118043537.338769-1-a3205153416@gmail.com>
- In-Reply-To
- <20260117175847.334666-1-a3205153416@gmail.com>
The test script t2203-add-intent.sh uses the pattern `git status | grep -v` in multiple places. This pipeline masks the exit code of `git status`.
Update the tests to use `git status -uno >actual`. This excludes untracked files from the output entirely, removing the need for filtering with `grep` and allowing us to drop the pipeline, ensuring any crash in `git status` is caught immediately.
Signed-off-by: Tian Yuchen <a3205153416@gmail.com> --- t/t2203-add-intent.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 192ad14b5f..5bdd12c91f 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -16,7 +16,7 @@ test_expect_success 'intent to add' ' ' test_expect_success 'git status' ' - git status --porcelain | grep -v actual >actual && + git status --porcelain -uno >actual && cat >expect <<-\EOF && DA 1.t A elif @@ -26,7 +26,7 @@ test_expect_success 'git status' ' ' test_expect_success 'git status with porcelain v2' ' - git status --porcelain=v2 | grep -v "^?" >actual && + git status --porcelain=v2 -uno >actual && nam1=$(echo 1 | git hash-object --stdin) && nam2=$(git hash-object elif) && cat >expect <<-EOF && @@ -171,17 +171,17 @@ test_expect_success 'rename detection finds the right names' ' mv first third && git add -N third && - git status | grep -v "^?" >actual.1 && + git status -uno >actual.1 && test_grep "renamed: *first -> third" actual.1 && - git status --porcelain | grep -v "^?" >actual.2 && + git status --porcelain -uno >actual.2 && cat >expected.2 <<-\EOF && R first -> third EOF test_cmp expected.2 actual.2 && hash=$(git hash-object third) && - git status --porcelain=v2 | grep -v "^?" >actual.3 && + git status --porcelain=v2 -uno >actual.3 && cat >expected.3 <<-EOF && 2 .R N... 100644 100644 100644 $hash $hash R100 third first EOF @@ -211,11 +211,11 @@ test_expect_success 'double rename detection in status' ' mv second third && git add -N third && - git status | grep -v "^?" >actual.1 && + git status -uno >actual.1 && test_grep "renamed: *first -> second" actual.1 && test_grep "renamed: *second -> third" actual.1 && - git status --porcelain | grep -v "^?" >actual.2 && + git status --porcelain -uno >actual.2 && cat >expected.2 <<-\EOF && R first -> second R second -> third @@ -223,7 +223,7 @@ test_expect_success 'double rename detection in status' ' test_cmp expected.2 actual.2 && hash=$(git hash-object third) && - git status --porcelain=v2 | grep -v "^?" >actual.3 && + git status --porcelain=v2 -uno >actual.3 && cat >expected.3 <<-EOF && 2 R. N... 100644 100644 100644 $hash $hash R100 second first 2 .R N... 100644 100644 100644 $hash $hash R100 third second base-commit: 7264e61d87e58b9d0f5e6424c47c11e9657dfb75
-- 2.43.0