Git 1.7.0.1

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

diff --git a/Documentation/RelNotes-1.7.0.1.txt b/Documentation/RelNotes-1.7.0.1.txt
index 970cd59330b67d3ddb7e7016c949e9c0a216517f..8ff5bcada81f47f321eb6b7cb3a67963fe92a088 100644 (file)
--- a/Documentation/RelNotes-1.7.0.1.txt
+++ b/Documentation/RelNotes-1.7.0.1.txt
@@ -7,9 +7,17 @@ Fixes since v1.7.0
  * In a freshly created repository "rev-parse HEAD^0" complained that
    it is dangling symref, even though "rev-parse HEAD" didn't.
 
  * In a freshly created repository "rev-parse HEAD^0" complained that
    it is dangling symref, even though "rev-parse HEAD" didn't.
 

+ * "git show :no-such-name" tried to access the index without bounds
+   check, leading to a potential segfault.
+

  * Message from "git cherry-pick" was harder to read and use than necessary
    when it stopped due to conflicting changes.
 
  * Message from "git cherry-pick" was harder to read and use than necessary
    when it stopped due to conflicting changes.
 

+ * We referred to ".git/refs/" throughout the documentation when we
+   meant to talk about abstract notion of "ref namespace".  Because
+   people's repositories often have packed refs these days, this was
+   confusing.
+

  * "git diff --output=/path/that/cannot/be/written" did not correctly
    error out.
 
  * "git diff --output=/path/that/cannot/be/written" did not correctly
    error out.
 


@@ -24,8 +32,4 @@ Fixes since v1.7.0
    option was propagated to "git stash drop" that is internally run at the
    end.
 
    option was propagated to "git stash drop" that is internally run at the
    end.
 

---
-exec >/var/tmp/1
-echo O=$(git describe)
-O=v1.7.0-22-gc69f921
-git shortlog $O..
+And other minor fixes and documentation updates.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 01c463101b9b212f002e10a0d9e89a2df12652a2..cc32ce18d213ab5e986df90b0b23a7eb79226c39 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.7.0/git.html[documentation for release 1.7.0]
+* link:v1.7.0.1/git.html[documentation for release 1.7.0.1]

 
 * release notes for
 
 * release notes for

+  link:RelNotes-1.7.0.1.txt[1.7.0.1],

   link:RelNotes-1.7.0.txt[1.7.0].
 
 * link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
   link:RelNotes-1.7.0.txt[1.7.0].
 
 * link:v1.6.6.2/git.html[documentation for release 1.6.6.2]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a668143d7a42dd6323d73b9acee62ac7a992f7ea..7f894fdd4655ddad9fe3228141a5f21959f1450e 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.0.GIT
+DEF_VER=v1.7.0.1

 
 LF='
 '
 
 LF='
 '