[PATCH v3] t1410-reflog.sh: avoid suppressing git's exit code in pipelines
- From
- Gatla Vishweshwar Reddy <gatlavishweshwarreddy26@gmail.com>
- Date
- Jul 8, 2026, 09:20 UTC
- Message-ID
- <20260708092448.35776-1-gatlavishweshwarreddy26@gmail.com>
- In-Reply-To
- <xmqqechf8ryu.fsf@gitster.g>
Piping git commands directly to wc -l suppresses the exit code of git, hiding potential failures from the test suite. Capture the output to a temporary file first, then count the lines separately to preserve the exit code. Where the expected count is known ahead of time, use test_stdout_line_count instead.
Signed-off-by: Gatla Vishweshwar Reddy <gatlavishweshwarreddy26@gmail.com> ---
Changes in v3: - Removed all variables (HEAD_entry_count, main_entry_count) entirely - Removed all temporary file captures (reflog_output, reflog_main_output) - Used test_stdout_line_count with hardcoded counts throughout - The counts are known ahead of time: HEAD=5, main=5 initially,decreasing as entries are deleted
t/t1410-reflog.sh | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index ce71f9a30a..3f2e36cf33 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -244,30 +244,22 @@ test_expect_success 'delete' ' test_tick && git commit -m tiger C && - HEAD_entry_count=$(git reflog | wc -l) && - main_entry_count=$(git reflog show main | wc -l) && - - test $HEAD_entry_count = 5 && - test $main_entry_count = 5 && - + test_stdout_line_count = 5 git reflog && + test_stdout_line_count = 5 git reflog show main && git reflog delete main@{1} && + test_stdout_line_count = 4 git reflog show main && + test_stdout_line_count = 5 git reflog && git reflog show main > output && - test_line_count = $(($main_entry_count - 1)) output && - test $HEAD_entry_count = $(git reflog | wc -l) && ! grep ox < output && - main_entry_count=$(wc -l < output) && - git reflog delete HEAD@{1} && - test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) && - test $main_entry_count = $(git reflog show main | wc -l) && - - HEAD_entry_count=$(git reflog | wc -l) && + test_stdout_line_count = 4 git reflog && + test_stdout_line_count = 4 git reflog show main && git reflog delete main@{07.04.2005.15:15:00.-0700} && + test_stdout_line_count = 3 git reflog show main && git reflog show main > output && - test_line_count = $(($main_entry_count - 1)) output && ! grep dragon < output ' @@ -319,13 +311,12 @@ test_expect_success 'git reflog expire unknown reference' ' test_must_fail git reflog expire does-not-exist 2>stderr && test_grep "error: reflog could not be found: ${SQ}does-not-exist${SQ}" stderr ' - test_expect_success 'checkout should not delete log for packed ref' ' - test $(git reflog main | wc -l) = 4 && + test_stdout_line_count = 4 git reflog main && git branch foo && git pack-refs --all && git checkout foo && - test $(git reflog main | wc -l) = 4 + test_stdout_line_count = 4 git reflog main ' test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' ' -- 2.54.0