Git 1.7.7-rc3

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 f10ff2882072a1754d8523ed624b8f9ab232a127..7fe5218cf311008dd98aeecabb634e219f872415 100644 (file)
--- a/Documentation/RelNotes/1.7.7.txt
+++ b/Documentation/RelNotes/1.7.7.txt
@@ -130,43 +130,14 @@ Fixes since v1.7.6
 Unless otherwise noted, all fixes in the 1.7.6.X maintenance track are
 included in this release.
 
 Unless otherwise noted, all fixes in the 1.7.6.X maintenance track are
 included in this release.
 

- * The error reporting logic of "git am" when the command is fed a file
-   whose mail-storage format is unknown was fixed.
-   (merge dff4b0e gb/maint-am-patch-format-error-message later to 'maint').
-
- * "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly.
-   (merge e9d4f74 mg/branch-set-upstream-previous later to 'maint').
-

  * "git branch -m" and "git checkout -b" incorrectly allowed the tip
    of the branch that is currently checked out updated.
    (merge 55c4a67 ci/forbid-unwanted-current-branch-update later to 'maint').
 
  * "git branch -m" and "git checkout -b" incorrectly allowed the tip
    of the branch that is currently checked out updated.
    (merge 55c4a67 ci/forbid-unwanted-current-branch-update later to 'maint').
 

- * "git check-ref-format --print" used to parrot a candidate string that
-   began with a slash (e.g. /refs/heads/master) without stripping it, to make
-   the result a suitably normalized string the caller can append to "$GIT_DIR/".
-   (merge f3738c1 mh/check-ref-format-print-normalize later to 'maint').
-
- * "git clone" failed to clone locally from a ".git" file that itself
-   is not a directory but is a pointer to one.
-   (merge 9b0ebc7 nd/maint-clone-gitdir later to 'maint').
-
- * "git clone" from a local repository that borrows from another
-   object store using a relative path in its objects/info/alternates
-   file did not adjust the alternates in the resulting repository.
-   (merge e6baf4a1 jc/maint-clone-alternates 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)
 --
 exec >/var/tmp/1
 echo O=$(git describe master)

-O=v1.7.7-rc2
+O=v1.7.7-rc3

 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 647dc603ab789446a33c34dc1dabb00a92c5385e..e7657280e130d9e1bee4b7f1320197b47279f29d 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.7-rc2
+DEF_VER=v1.7.7-rc3

 
 LF='
 '
 
 LF='
 '