git/trailer.c, branch v2.3.3

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

trailer: reuse ignore_non_trailer() to ignore conflict lines

2014-11-10T18:00:02Z

Make sure we look for trailers before any conflict line by reusing the ignore_non_trailer() function. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

trailer: display a trailer without its trailing newline

2014-11-10T17:43:59Z

Trailers passed to the parse_trailer() function often have a trailing newline. When erroring out, we should display the invalid trailer properly, that means without any trailing newline. Helped-by: Junio C Hamano Helped-by: Jeff King Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

trailer: ignore comment lines inside the trailers

2014-11-10T17:43:16Z

Otherwise trailers that are commented out might be processed. We would also error out if the comment line char is also a separator. This means that comments inside a trailer block will disappear, but that was already the case anyway. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

use child_process_init() to initialize struct child_process variables

2014-10-28T21:56:17Z

Call child_process_init() instead of zeroing the memory of variables of type struct child_process by hand before use because the former is both clearer and shorter. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

trailer: execute command from 'trailer..command'

2014-10-13T20:59:48Z

Let the user specify a command that will give on its standard output the value to use for the specified trailer. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

trailer: put all the processing together and print

2014-10-13T20:55:27Z

This patch adds the process_trailers() function that calls all the previously added processing functions and then prints the results on the standard output. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano