4 commits

Author	SHA1	Message	Date
Christian Couder	3d24a7267d	trailer: add test with an old style conflict block ... Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-11-10 10:00:07 -08:00
Christian Couder	61cfef4ca4	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>	2014-11-10 10:00:02 -08:00
Christian Couder	b9384ff34e	trailer: add tests for commands in config file ... And add a few other tests for some special cases. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-10-13 13:59:48 -07:00
Christian Couder	76bed78a58	trailer: add tests for "git interpret-trailers" ... Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-10-13 13:59:45 -07:00