Git 2.2.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 17, 2014 at 11:49 UTC 9b7cbb315923e61bb0c4297c701089f30e116750
4 files changed +38 -3
Documentation/RelNotes/2.2.1.txt new
+34
@@ -0,0 +1,34 @@
1 +Git v2.2.1 Release Notes
2 +========================
3 +
4 +Fixes since v2.2
5 +----------------
6 +
7 + * We used to allow committing a path ".Git/config" with Git that is
8 + running on a case sensitive filesystem, but an attempt to check out
9 + such a path with Git that runs on a case insensitive filesystem
10 + would have clobbered ".git/config", which is definitely not what
11 + the user would have expected. Git now prevents you from tracking
12 + a path with ".Git" (in any case combination) as a path component.
13 +
14 + * On Windows, certain path components that are different from ".git"
15 + are mapped to ".git", e.g. "git~1/config" is treated as if it were
16 + ".git/config". HFS+ has a similar issue, where certain unicode
17 + codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
18 + it were ".git/config". Pathnames with these potential issues are
19 + rejected on the affected systems. Git on systems that are not
20 + affected by this issue (e.g. Linux) can also be configured to
21 + reject them to ensure cross platform interoperability of the hosted
22 + projects.
23 +
24 + * "git fsck" notices a tree object that records such a path that can
25 + be confused with ".git", and with receive.fsckObjects configuration
26 + set to true, an attempt to "git push" such a tree object will be
27 + rejected. Such a path may not be a problem on a well behaving
28 + filesystem but in order to protect those on HFS+ and on case
29 + insensitive filesystems, this check is enabled on all platforms.
30 +
31 +A big "thanks!" for bringing this issue to us goes to our friends in
32 +the Mercurial land, namely, Matt Mackall and Augie Fackler.
33 +
34 +Also contains typofixes, documentation updates and trivial code clean-ups.
Documentation/git.txt
+2 -1
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
43 branch of the `git.git` repository.
44 Documentation for older releases are available here:
45
46 -* link:v2.2.0/git.html[documentation for release 2.2]
46 +* link:v2.2.1/git.html[documentation for release 2.2.1]
47
48 * release notes for
49 + link:RelNotes/2.2.1.txt[2.2.1],
50 link:RelNotes/2.2.0.txt[2.2].
51
52 * link:v2.1.4/git.html[documentation for release 2.1.4]
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.2.0.GIT
4 +DEF_VER=v2.2.1
5
6 LF='
7 '
RelNotes
+1 -1
@@ -1 +1 @@
1 -Documentation/RelNotes/2.2.0.txt
\ No newline at end of file
1 +Documentation/RelNotes/2.2.1.txt
\ No newline at end of file