git, branch v2.3.7

Git 2.3.7

2015-04-27T19:25:36Z

Signed-off-by: Junio C Hamano

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

2015-04-27T19:23:54Z

An earlier update to the parser that disects a URL broke an address, followed by a colon, followed by an empty string (instead of the port number), e.g. ssh://example.com:/path/to/repo. * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname

Merge branch 'ma/bash-completion-leaking-x' into maint

2015-04-27T19:23:51Z

The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend

Merge branch 'jc/push-cert' into maint

2015-04-27T19:23:50Z

The "git push --signed" protocol extension did not limit what the "nonce" that is a server-chosen string can contain or how long it can be, which was unnecessarily lax. Limit both the length and the alphabet to a reasonably small space that can still have enough entropy. * jc/push-cert: push --signed: tighten what the receiving end can ask to sign

Git 2.3.6

2015-04-21T19:17:09Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/colors' into maint

2015-04-21T19:12:25Z

"diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters

Merge branch 'jk/test-annoyances' into maint

2015-04-21T19:12:24Z

Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit

Merge branch 'pt/enter-repo-comment-fix' into maint

2015-04-21T19:12:23Z

Documentation update. * pt/enter-repo-comment-fix: enter_repo(): fix docs to match code

Merge branch 'jz/gitweb-conf-doc-fix' into maint

2015-04-21T19:12:22Z

Documentation update. * jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time"

Merge branch 'jk/cherry-pick-docfix' into maint

2015-04-21T19:12:21Z

* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits