git/trailer.c, branch v2.7.2

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

trailer: use capture_command

2015-03-23T04:39:18Z

When we read from a trailer.*.command sub-program, the current code uses run_command followed by a pipe read, which can result in deadlock (though in practice you would have to have a large trailer for this to be a problem). The current code also leaks the file descriptor for the pipe to the sub-command. Instead, let's use capture_command, which makes this simpler (and we can get rid of our custom helper). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

do not include the same header twice

2015-02-13T21:16:12Z

A few files include the same header file directly more than once. As all these headers protect themselves against repeated inclusion by the "#ifndef FOO_H / #define FOO_H / ... / #endif" idiom, leave only the first inclusion and remove the later inclusion as a no-op clean-up. Signed-off-by: Дилян Палаузов Signed-off-by: Junio C Hamano

Merge branch 'cc/interpret-trailers-more'

2014-12-22T20:26:24Z

"git interpret-trailers" learned to properly handle the "Conflicts:" block at the end. * cc/interpret-trailers-more: trailer: add test with an old style conflict block trailer: reuse ignore_non_trailer() to ignore conflict lines commit: make ignore_non_trailer() non static merge & sequencer: turn "Conflicts:" hint into a comment builtin/commit.c: extract ignore_non_trailer() helper function merge & sequencer: unify codepaths that write "Conflicts:" hint builtin/merge.c: drop a parameter that is never used

Merge branch 'cc/interpret-trailers'

2014-11-19T21:47:52Z

Small fixes to a new experimental command already in 'master'. * cc/interpret-trailers: trailer: display a trailer without its trailing newline trailer: ignore comment lines inside the trailers

trailer: use CHILD_PROCESS_INIT in apply_command()

2014-11-10T18:03:39Z

Initialize the struct child_process variable cp at declaration time. This is shorter, saves a function call and prevents using the variable before initialization by mistake. Suggested-by: Jeff King Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano