git/git.c, branch v2.3.7

Merge branch 'ak/git-done-help-cleanup' into maint

2015-03-23T18:23:35Z

Code simplification. * ak/git-done-help-cleanup: git: make was_alias and done_help non-static

git: treat "git -C ''" as a no-op when is empty

2015-03-07T03:42:00Z

'git -C ""' unhelpfully dies with error "Cannot change to ''", whereas the shell treats `cd ""' as a no-op. Taking the shell's behavior as a precedent, teach git to treat `-C ""' as a no-op, as well. Helped-by: Junio C Hamano Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak Signed-off-by: Junio C Hamano

git: make was_alias and done_help non-static

2015-03-06T20:03:30Z

'was_alias' variable does not need to store it's value on each iteration in the loop; this variable gets assigned the result of run_argv() every time in the loop before being used. 'done_help' variable does not need to be static variable too if we move it out the loop. Signed-off-by: Alexander Kuleshov Helped-by: Eric Sunshine Helped-by: Jeff King Signed-off-by: Junio C Hamano

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