GIT 1.6.3.1

Signed-off-by: Junio C Hamano <redacted>

diff --git a/Documentation/RelNotes-1.6.3.1.txt b/Documentation/RelNotes-1.6.3.1.txt
index 98c02250bb69f70b4c08d4f7e535909ed4a5d6f5..2400b72ef7bcb53dadced93634a7df2ea96cc34f 100644 (file)
--- a/Documentation/RelNotes-1.6.3.1.txt
+++ b/Documentation/RelNotes-1.6.3.1.txt
@@ -4,9 +4,7 @@ GIT v1.6.3.1 Release Notes
 Fixes since v1.6.3
 ------------------
 
---
-exec >/var/tmp/1
-O=v1.6.3
-echo O=$(git describe maint)
-git shortlog $O..maint
-
+* "git checkout -b new-branch" with a staged change in the index
+  incorrectly primed the in-index cache-tree, resulting a wrong tree
+  object to be written out of the index.  This is a grave regression
+  since the last 1.6.2.X maintenance release.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 39cde784c947fae6a2f294caac1898b9199d769d..d292e3a2d38a935a0f06b708d9d0b4a36d58ba66 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.3.GIT
+DEF_VER=v1.6.3.1
 
 LF='
 '