Git 1.7.11.5

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

Junio C Hamano committed Aug 15, 2012 at 13:39 UTC cd7c0be19f49efe77a8b0690ab92d2eb1cff1778
3 files changed +11 -2
Documentation/RelNotes/1.7.11.5.txt
+8
@@ -7,6 +7,10 @@ Fixes since v1.7.11.4
7 * The Makefile rule to create assembly output (primarily for
8 debugging purposes) did not create it next to the source.
9
10 + * The code to avoid mistaken attempt to add the object directory
11 + itself as its own alternate could read beyond end of a string while
12 + comparison.
13 +
14 * On some architectures, "block-sha1" did not compile correctly
15 when compilers inferred alignment guarantees from our source we
16 did not intend to make.
@@ -25,4 +29,8 @@ Fixes since v1.7.11.4
29 * "git mergetool" did not support --tool-help option to give the list
30 of supported backends, like "git difftool" does.
31
32 + * "git grep" stopped spawning an external "grep" long time ago, but a
33 + duplicated test to check internal and external "grep" was left
34 + behind.
35 +
36 Also contains minor typofixes and documentation updates.
Documentation/git.txt
+2 -1
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
44 branch of the `git.git` repository.
45 Documentation for older releases are available here:
46
47 -* link:v1.7.11.4/git.html[documentation for release 1.7.11.4]
47 +* link:v1.7.11.5/git.html[documentation for release 1.7.11.5]
48
49 * release notes for
50 + link:RelNotes/1.7.11.5.txt[1.7.11.5],
51 link:RelNotes/1.7.11.4.txt[1.7.11.4],
52 link:RelNotes/1.7.11.3.txt[1.7.11.3],
53 link:RelNotes/1.7.11.2.txt[1.7.11.2],
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.11.4
4 +DEF_VER=v1.7.11.5
5
6 LF='
7 '