kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'gr/t1410-reflog-exit-code' 

The pipelines in 't1410-reflog.sh' have been replaced with the
'test_stdout_line_count' helper to avoid suppressing the exit code of
'git' commands, ensuring failures are not hidden from the test suite.

* gr/t1410-reflog-exit-code:
  t1410-reflog.sh: avoid suppressing git's exit code in pipelines
main
Junio C Hamano 2026-07-19 10:42:18 -07:00
parent c9a92e239f c4fcd5039b
commit 009713e926
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
t/t1410-reflog.sh
View File

@ -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

'
@ -321,11 +313,11 @@ test_expect_success 'git reflog expire unknown reference' '
'

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)' '