Git 1.7.7-rc0

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

diff --git a/Documentation/RelNotes/1.7.7.txt b/Documentation/RelNotes/1.7.7.txt
index dcbda84e868a921765cae0e41716cc44798aee1b..a717cd622a9d9a99d6003790f629822c52589e4f 100644 (file)
--- a/Documentation/RelNotes/1.7.7.txt
+++ b/Documentation/RelNotes/1.7.7.txt
@@ -103,14 +103,21 @@ Fixes since v1.7.6
 Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are
 included in this release.
 
 Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are
 included in this release.
 

- * "ls-files ../$path" that is run from a subdirectory reported errors
+ * "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly.
+   (merge e9d4f74 mg/branch-set-upstream-previous later to 'maint').
+
+ * "git describe --dirty" did not refresh the index before checking the
+   state of the working tree files.
+   (cherry-pick bb57148 ac/describe-dirty-refresh later to 'maint').
+
+ * "git ls-files ../$path" that is run from a subdirectory reported errors

    incorrectly when there is no such path that matches the given pathspec.
    (merge 0f64bfa cb/maint-ls-files-error-report later to 'maint').
 
 --
 exec >/var/tmp/1
 echo O=$(git describe master)
    incorrectly when there is no such path that matches the given pathspec.
    (merge 0f64bfa cb/maint-ls-files-error-report later to 'maint').
 
 --
 exec >/var/tmp/1
 echo O=$(git describe master)

-O=v1.7.6-576-g6fcb384
+O=v1.7.6.1-415-g284daf2

 git log --first-parent --oneline $O..master
 echo
 git shortlog --no-merges ^maint ^$O master
 git log --first-parent --oneline $O..master
 echo
 git shortlog --no-merges ^maint ^$O master

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8270abb5f982463119309423eded333a8153317e..fea63c14beaf06caece3958bd26fcf3647bb1ac1 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.6.GIT
+DEF_VER=v1.7.7-rc0

 
 LF='
 '
 
 LF='
 '