diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:59:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:59:15 -0700 |
| commit | 8f9aeb0d36c6cbfb849946bb272fa0d3c4611547 (patch) | |
| tree | 1885c2e8840ec2019fd1929193e3977ce4ab63e5 | |
| parent | 75d4476f52f734bb1a01be9dfc99b1797cb3bdfe (diff) | |
| download | git-8f9aeb0d36c6cbfb849946bb272fa0d3c4611547.tar.gz git-8f9aeb0d36c6cbfb849946bb272fa0d3c4611547.tar.xz | |
Git 2.12.2v2.12.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.12.2.txt | 22 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.12.2.txt b/Documentation/RelNotes/2.12.2.txt index 9efc34835..441939709 100644 --- a/Documentation/RelNotes/2.12.2.txt +++ b/Documentation/RelNotes/2.12.2.txt @@ -58,4 +58,26 @@ Fixes since v2.12.1 ignore anything after '>' when picking addresses, to allow non-address cruft like " # stable 4.4" after the address. + * "git push" had a handful of codepaths that could lead to a deadlock + when unexpected error happened, which has been fixed. + + * Code to read submodule.<name>.ignore config did not state the + variable name correctly when giving an error message diagnosing + misconfiguration. + + * "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. + + * The code to parse the command line "git grep <patterns>... <rev> + [[--] <pathspec>...]" has been cleaned up, and a handful of bugs + have been fixed (e.g. we used to check "--" if it is a rev). + + * 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. + Also contains various documentation updates and code clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index 25560f69f..88c39d3ed 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.12.1/git.html[documentation for release 2.12.1] +* link:v2.12.2/git.html[documentation for release 2.12.2] * release notes for + link:RelNotes/2.12.2.txt[2.12.2]. link:RelNotes/2.12.1.txt[2.12.1]. link:RelNotes/2.12.0.txt[2.12]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d18eb6d9b..e83f591a7 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.12.1 +DEF_VER=v2.12.2 LF=' ' |