git/git.c, branch v2.3.3

Merge branch 'ak/fewer-includes'

2015-01-14T20:37:19Z

* ak/fewer-includes: cat-file: remove unused includes git.c: remove unnecessary #includes

git.c: remove unnecessary #includes

2015-01-10T00:16:56Z

"cache.h" and "commit.h" are already included via "builtin.h". We started to include "quote.h" at 575ba9d6 (GIT_TRACE: show which built-in/external commands are executed, 2006-06-25) that wanted to use sq_quote_print(). When 6ce4e61f (Trace into a file or an open fd and refactor tracing code., 2006-09-02) introduced trace.c API, the calls this file makes to sq_quote_print() were replaced by calls to trace_argv_printf() that are declared in "cache.h", which this file already includes. We should have stopped including "quote.h" in that commit, but forgot to do so. Signed-off-by: Alexander Kuleshov Signed-off-by: Junio C Hamano

Merge branch 'sv/get-builtin'

2014-12-05T19:42:26Z

* sv/get-builtin: builtin: move builtin retrieval to get_builtin()

builtin: move builtin retrieval to get_builtin()

2014-11-13T18:40:41Z

There was a redundant code for a builtin command retrieval in 'handle_builtin()' and 'is_builtin()'. Introduce a new function 'get_builtin()' and using it from both of these places to reduce the redundancy. Signed-off-by: Slavomir Vlcek Signed-off-by: Junio C Hamano

Merge branch 'cc/interpret-trailers'

2014-10-20T19:25:32Z

A new filter to programatically edit the tail end of the commit log messages. * cc/interpret-trailers: Documentation: add documentation for 'git interpret-trailers' trailer: add tests for commands in config file trailer: execute command from 'trailer..command' trailer: add tests for "git interpret-trailers" trailer: add interpret-trailers command trailer: put all the processing together and print trailer: parse trailers from file or stdin trailer: process command line trailer arguments trailer: read and process config information trailer: process trailers from input message and arguments trailer: add data structures and basic functions

trailer: add interpret-trailers command

2014-10-13T20:55:27Z

This patch adds the "git interpret-trailers" command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Merge branch 'pr/use-default-sigpipe-setting'

2014-09-30T05:17:20Z

We used to get confused when a process called us with SIGPIPE ignored; we do want to die with SIGPIPE when the output is not read by default, and do ignore the signal when appropriate. * pr/use-default-sigpipe-setting: mingw.h: add dummy functions for sigset_t operations unblock and unignore SIGPIPE

Merge branch 'rs/realloc-array'

2014-09-26T21:39:45Z

Code cleanup. * rs/realloc-array: use REALLOC_ARRAY for changing the allocation size of arrays add macro REALLOC_ARRAY

Merge branch 'ah/grammofix'

2014-09-19T18:38:35Z

* ah/grammofix: grammofix in user-facing messages

unblock and unignore SIGPIPE

2014-09-18T17:38:49Z

Blocked and ignored signals -- but not caught signals -- are inherited across exec. Some callers with sloppy signal-handling behavior can call git with SIGPIPE blocked or ignored, even non-deterministically. When SIGPIPE is blocked or ignored, several git commands can run indefinitely, ignoring EPIPE returns from write() calls, even when the process that called them has gone away. Our specific case involved a pipe of git diff-tree output to a script that reads a limited amount of diff data. In an ideal world, git would never be called with SIGPIPE blocked or ignored. But in the real world, several real potential callers, including Perl, Apache, and Unicorn, sometimes spawn subprocesses with SIGPIPE ignored. It is easier and more productive to harden git against this mistake than to clean it up in every potential parent process. Signed-off-by: Patrick Reynolds Signed-off-by: Junio C Hamano