Git 1.7.1.2

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

diff --git a/Documentation/RelNotes-1.7.1.2.txt b/Documentation/RelNotes-1.7.1.2.txt
index 46b6a960c799a5324b48ea2e266eaab5187ded24..61ba14e262a450c47d1490f4eedadbf8031fd3ed 100644 (file)
--- a/Documentation/RelNotes-1.7.1.2.txt
+++ b/Documentation/RelNotes-1.7.1.2.txt
@@ -17,3 +17,12 @@ Fixes since v1.7.1.1
 
  * "git rev-parse --parseopt --stop-at-non-option" did not stop at non option
    when --keep-dashdash was in effect.
+
+ * An overlong line after ".gitdir: " in a git file caused out of bounds
+   access to an array on the stack.
+
+ * "git config --path conf.var" to attempt to expand a variable conf.var
+   that uses "~/" short-hand segfaulted when $HOME environment variable
+   was not set.
+
+And other minor fixes and documentation updates.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index abbd9848e44b69904e0446dba46b694d118c366e..b5a4e3d4031961d648b52abc1c64df5b4acfb32c 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,11 @@ branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 
-* link:v1.7.1/git.html[documentation for release 1.7.1]
+* link:v1.7.1.2/git.html[documentation for release 1.7.1.2]
 
 * release notes for
+  link:RelNotes-1.7.1.2.txt[1.7.1.2],
+  link:RelNotes-1.7.1.1.txt[1.7.1.1],
   link:RelNotes-1.7.1.txt[1.7.1].
 
 * link:v1.7.0.7/git.html[documentation for release 1.7.0.7]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d4cb58e5df10d560cf7fe8680ca81ec217036b23..31d95da4f0adc89466acc62accd90e67cfa0353a 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.1.1
+DEF_VER=v1.7.1.2
 
 LF='
 '