git/trailer.c, branch v2.10.2

cocci: refactor common patterns to use xstrdup_or_null()

2016-10-12T18:22:10Z

d64ea0f83b ("git-compat-util: add xstrdup_or_null helper", 2015-01-12) added a handy wrapper that allows us to get a duplicate of a string or NULL if the original is NULL, but a handful of codepath predate its introduction or just weren't aware of it. Signed-off-by: Junio C Hamano

die("bug"): report bugs consistently

2016-07-26T18:13:44Z

The vast majority of error messages in Git's source code which report a bug use the convention to prefix the message with "BUG:". As part of cleaning up merge-recursive to stop die()ing except in case of detected bugs, let's just make the remainder of the bug reports consistent with the de facto rule. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

trailer.c: mark strings for translation

2016-02-29T22:27:58Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

interpret-trailers: add option for in-place editing

2016-01-14T20:22:17Z

Add a command line option --in-place to support in-place editing akin to sed -i. This allows to write commands like the following: git interpret-trailers --trailer "X: Y" a.txt > b.txt && mv b.txt a.txt in a more concise way: git interpret-trailers --trailer "X: Y" --in-place a.txt Signed-off-by: Tobias Klauser Signed-off-by: Junio C Hamano

trailer: allow to write to files other than stdout

2016-01-14T20:22:10Z

Use fprintf instead of printf in trailer.c in order to allow printing to a file other than stdout. This will be needed to support in-place editing in git interpret-trailers. Signed-off-by: Tobias Klauser Signed-off-by: Junio C Hamano

Merge branch 'cc/trailers-corner-case-fix'

2015-09-02T19:50:21Z

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 title

2015-08-31T18:14:08Z

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 Signed-off-by: Junio C Hamano

Merge branch 'cc/trailers-corner-case-fix'

2015-08-28T19:32:17Z

"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 message

2015-08-26T19:16:56Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

trailer: ignore first line of message

2015-08-21T17:17:47Z

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 Signed-off-by: Junio C Hamano