git, branch v2.12.2

Git 2.12.2

2017-03-24T19:59:15Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/doc-no-option-notation-fix' into maint

2017-03-24T19:57:55Z

Doc fix. * ab/doc-no-option-notation-fix: doc: change erroneous --[no]-whatever into --[no-]whatever

Merge branch 'ab/push-default-doc-fix' into maint

2017-03-24T19:57:54Z

Doc fix. * ab/push-default-doc-fix: push: mention "push.default=tracking" in the documentation

Merge branch 'nd/commit-hook-doc-fix' into maint

2017-03-24T19:57:54Z

Doc fix. * nd/commit-hook-doc-fix: git-commit.txt: list post-rewrite in HOOKS section

Merge branch 'jc/config-case-cmdline-take-2' into maint

2017-03-24T19:57:54Z

The code to parse "git -c VAR=VAL cmd" and set configuration variable for the duration of cmd had two small bugs, which have been fixed. This supersedes jc/config-case-cmdline topic that has been discarded. * jc/config-case-cmdline-take-2: config: use git_config_parse_key() in git_config_parse_parameter() config: move a few helper functions up

Merge branch 'jk/grep-no-index-fix' into maint

2017-03-24T19:57:53Z

The code to parse the command line "git grep ... [[--] ...]" has been cleaned up, and a handful of bugs have been fixed (e.g. we used to check "--" if it is a rev). * jk/grep-no-index-fix: grep: treat revs the same for --untracked as for --no-index grep: do not diagnose misspelt revs with --no-index grep: avoid resolving revision names in --no-index case grep: fix "--" rev/pathspec disambiguation grep: re-order rev-parsing loop grep: do not unnecessarily query repo for "--" grep: move thread initialization a little lower

Merge branch 'jn/remote-helpers-with-git-dir' into maint

2017-03-24T19:57:53Z

"git ls-remote" and "git archive --remote" are designed to work without being in a directory under Git's control. However, recent updates revealed that we randomly look into a directory called .git/ without actually doing necessary set-up when working in a repository. Stop doing so. * jn/remote-helpers-with-git-dir: remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR remote: avoid reading $GIT_DIR config in non-repo

Merge branch 'sb/submodule-config-parse-ignore-fix' into maint

2017-03-24T19:57:52Z

Code to read submodule..ignore config did not state the variable name correctly when giving an error message diagnosing misconfiguration. * sb/submodule-config-parse-ignore-fix: submodule-config: correct error reporting for invalid ignore value

Merge branch 'jk/push-deadlock-regression-fix' into maint

2017-03-24T19:57:52Z

"git push" had a handful of codepaths that could lead to a deadlock when unexpected error happened, which has been fixed. * jk/push-deadlock-regression-fix: send-pack: report signal death of pack-objects send-pack: read "unpack" status even on pack-objects failure send-pack: improve unpack-status error messages send-pack: use skip_prefix for parsing unpack status send-pack: extract parsing of "unpack" response receive-pack: fix deadlock when we cannot create tmpdir

mailmap: use Michael J Gruber's new address

2017-03-24T19:30:27Z

Map both old addresses to the new, hopefully more permanent one. Signed-off-by: Michael J Gruber Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano