summaryrefslogtreecommitdiff
path: root/t/t7513-interpret-trailers.sh
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2014-11-09 09:23:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-10 18:00:02 (GMT)
commit61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc (patch)
tree75f68e68c37708205075003845e1ff8566fd1ef9 /t/t7513-interpret-trailers.sh
parent8c3845892363abf3fb5cf2fe61bc455554f50c68 (diff)
downloadgit-61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc.zip
git-61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc.tar.gz
git-61cfef4ca4bdacbb90866fa8fd0e0f0b16b2cafc.tar.bz2
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/t7513-interpret-trailers.sh')
-rwxr-xr-xt/t7513-interpret-trailers.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 1efb880..fed053a 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 &&