git/git.c, branch v2.4.9

Merge branch 'kn/git-cd-to-empty'

2015-03-20T20:11:46Z

"git -C '' subcmd" refused to work in the current directory, unlike "cd ''" which silently behaves as a no-op. * kn/git-cd-to-empty: git: treat "git -C ''" as a no-op when is empty

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

2015-03-17T23:01:28Z

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 'ah/usage-strings'

2015-02-11T21:44:20Z

* ah/usage-strings: standardize usage info string format

Merge branch 'ak/fewer-includes'

2015-01-14T20:37:19Z

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

standardize usage info string format

2015-01-14T17:32:04Z

This patch puts the usage info strings that were not already in docopt- like format into docopt-like format, which will be a litle easier for end users and a lot easier for translators. Changes include: - Placing angle brackets around fill-in-the-blank parameters - Putting dashes in multiword parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing * with [...] Signed-off-by: Alex Henrie Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

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