summaryrefslogtreecommitdiff
path: root/t/t7513-interpret-trailers.sh
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-09-021-0/+14
|\ | | | | | | | | | | | | | | | | The "interpret-trailers" helper mistook a multi-paragraph title of a commit log message with a colon in it as the end of the trailer block. * cc/trailers-corner-case-fix: trailer: support multiline title
| * trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently ignore the first line passed to `git interpret-trailers`, when looking for the beginning of the trailers. Unfortunately this does not work well when a commit is created with a line break in the title, using for example the following command: git commit -m 'place of code: change we made' That's why instead of ignoring only the first line, it is better to ignore the first paragraph. Signed-off-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-08-281-1/+14
|\ \ | |/ | | | | | | | | | | | | | | "interpret-trailers" helper mistook a single-liner log message that has a colon as the end of existing trailer. * cc/trailers-corner-case-fix: trailer: retitle a test and correct an in-comment message trailer: ignore first line of message
| * trailer: retitle a test and correct an in-comment messageChristian Couder2015-08-261-1/+1
| | | | | | | | | | Signed-off-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * trailer: ignore first line of messageChristian Couder2015-08-211-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking for the start of the trailers in the message we are passed, we should ignore the first line of the message. The reason is that if we are passed a patch or commit message then the first line should be the patch title. If we are passed only trailers we can expect that they start with an empty line that can be ignored too. This way we can properly process commit messages that have only one line with something that looks like a trailer, for example like "area of code: change we made". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | trailer: add test with an old style conflict blockcc/interpret-trailers-moreChristian Couder2014-11-101-1/+31
| | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder2014-11-101-0/+2
|/ | | | | | | | 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>
* trailer: add tests for commands in config fileChristian Couder2014-10-131-0/+125
| | | | | | | 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>
* trailer: add tests for "git interpret-trailers"Christian Couder2014-10-131-0/+738
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>