From 3a919c1dda247d27d7feff1b4c3d8219b81b0c1a Mon Sep 17 00:00:00 2001 From: Bryce Kwon Date: Sat, 7 Nov 2026 17:43:36 -1000 Subject: Move the Conflicts test to the trailers tests Its message came from a here-document with a dash, which stripped the tab git knows a Conflicts path by. git then found no trailer block at all, so the test passed with the guard it is about removed. The message is now written with printf. --- tests/t0303-robustness.sh | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'tests/t0303-robustness.sh') diff --git a/tests/t0303-robustness.sh b/tests/t0303-robustness.sh index f7409f1..016b2de 100755 --- a/tests/t0303-robustness.sh +++ b/tests/t0303-robustness.sh @@ -405,31 +405,6 @@ test_expect_success 'the blob page walks a path out of the commit or tag the id grep "^Status: 404" tmp ' -test_expect_success 'the commit page shows a message whole when text follows its trailers' ' - ( - cd repos/rob && - echo again >file-1 && - git add file-1 && - git commit -F - <<-\EOF - Subject - - Body text. - - Signed-off-by: A U Thor - - Conflicts: - file-1 - EOF - ) && - { - echo "enable-commit-trailers=1" && - cat robrc - } >trailrc && - cgit_rc trailrc "url=rob/commit/" >tmp && - ! grep "commit-trailers" tmp && - grep "Conflicts:" tmp -' - test_expect_success 'a revision expression that walks the history is refused' ' cgit_rc robrc "url=rob/log/&h=:/zzzz" >tmp && grep "^Status: 404" tmp && -- cgit 2.12.1