diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2014-11-09 10:23:42 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-11-10 10:00:02 -0800 |
| commit | 61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc (patch) | |
| tree | 75f68e68c37708205075003845e1ff8566fd1ef9 /t | |
| parent | commit: make ignore_non_trailer() non static (diff) | |
| download | tgif-61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc.tar.xz | |
trailer: reuse ignore_non_trailer() to ignore conflict lines
Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7513-interpret-trailers.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index 1efb88051a..fed053a7ec 100755 --- a/t/t7513-interpret-trailers.sh +++ b/t/t7513-interpret-trailers.sh @@ -232,6 +232,8 @@ test_expect_success 'with message that has comments' ' Reviewed-by: Johan Cc: Peff + # last comment + EOF cat basic_patch >>expected && git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual && |