git/t, branch v2.3.4

Merge branch 'sg/completion-remote' into maint

2015-03-23T18:23:33Z

Code simplification. * sg/completion-remote: completion: simplify __git_remotes() completion: add a test for __git_remotes() helper function

Merge branch 'jc/decorate-leaky-separator-color' into maint

2015-03-23T18:23:28Z

"git log --decorate" did not reset colors correctly around the branch names. * jc/decorate-leaky-separator-color: log --decorate: do not leak "commit" color into the next item Documentation/config.txt: simplify boolean description in the syntax section Documentation/config.txt: describe 'color' value type in the "Values" section Documentation/config.txt: have a separate "Values" section Documentation/config.txt: describe the structure first and then meaning Documentation/config.txt: explain multi-valued variables once Documentation/config.txt: avoid unnecessary negation

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

2015-03-23T18:23:25Z

"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 'mg/verify-commit' into maint

2015-03-23T18:23:20Z

Workarounds for certain build of GPG that triggered false breakage in a test. * mg/verify-commit: t7510: do not fail when gpg warns about insecure memory

Merge branch 'es/rebase-i-count-todo' into maint

2015-03-23T18:23:17Z

"git rebase -i" recently started to include the number of commits in the insn sheet to be processed, but on a platform that prepends leading whitespaces to "wc -l" output, the numbers are shown with extra whitespaces that aren't necessary. * es/rebase-i-count-todo: rebase-interactive: re-word "item count" comment rebase-interactive: suppress whitespace preceding item count

Merge branch 'tb/connect-ipv6-parse-fix' into maint

2015-03-23T18:23:13Z

We did not parse username followed by literal IPv6 address in SSH transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git correctly. * tb/connect-ipv6-parse-fix: t5500: show user name and host in diag-url t5601: add more test cases for IPV6 connect.c: allow ssh://user@[2001:db8::1]/repo.git

Merge branch 'ak/t5516-typofix' into maint

2015-03-14T05:56:11Z

* ak/t5516-typofix: t5516: correct misspelled pushInsteadOf

Merge branch 'jc/diff-test-updates' into maint

2015-03-14T05:56:10Z

Test clean-up. * jc/diff-test-updates: test_ln_s_add: refresh stat info of fake symbolic links t4008: modernise style t/diff-lib: check exact object names in compare_diff_raw tests: do not borrow from COPYING and README from the real source t4010: correct expected object names t9300: correct expected object names t4008: correct stale comments

Merge branch 'jk/diffcore-rename-duplicate' into maint

2015-03-14T05:56:08Z

A corrupt input to "git diff -M" can cause us to segfault. * jk/diffcore-rename-duplicate: diffcore-rename: avoid processing duplicate destinations diffcore-rename: split locate_rename_dst into two functions

Merge branch 'mk/diff-shortstat-dirstat-fix' into maint

2015-03-14T05:56:04Z

"git diff --shortstat --dirstat=changes" showed a dirstat based on lines that was never asked by the end user in addition to the dirstat that the user asked for. * mk/diff-shortstat-dirstat-fix: diff --shortstat --dirstat: remove duplicate output