diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-21 14:55:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-21 14:55:12 -0700 |
| commit | 8be51c1f36e7891c2d9c934d9bb8a81970a0f04e (patch) | |
| tree | 0b4d7efe5ba99b7a0c6d1d29816dfb48bb717534 /t | |
| parent | 3eba921f813641cdac96532c5c4fd99358a8cbb8 (diff) | |
| parent | 2541cba2d6808011be84469a3e700d0d59a1d612 (diff) | |
| download | git-8be51c1f36e7891c2d9c934d9bb8a81970a0f04e.tar.gz | |
Merge branch 'fs/find-end-of-log-message-fix'
The code to find the effective end of log message can fall into an
endless loop, which has been corrected.
* fs/find-end-of-log-message-fix:
wt-status: don't find scissors line beyond buf len
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7513-interpret-trailers.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index ec9c6de114..3d3e13ccf8 100755 --- a/t/t7513-interpret-trailers.sh +++ b/t/t7513-interpret-trailers.sh @@ -1935,4 +1935,18 @@ test_expect_success 'suppressing --- does not disable cut-line handling' ' test_cmp expected actual ' +test_expect_success 'handling of --- lines in conjunction with cut-lines' ' + echo "my-trailer: here" >expected && + + git interpret-trailers --parse >actual <<-\EOF && + subject + + my-trailer: here + --- + # ------------------------ >8 ------------------------ + EOF + + test_cmp expected actual +' + test_done |