Merge 1.7.6.4 in

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-09-23 15:31:08 -07:00
commit b7619006eb
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,32 @@
Git v1.7.6.4 Release Notes
==========================
Fixes since v1.7.6.3
--------------------
* The error reporting logic of "git am" when the command is fed a file
whose mail-storage format is unknown was fixed.
* "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly.
* "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/".
* "git clone" failed to clone locally from a ".git" file that itself
is not a directory but is a pointer to one.
* "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.
* "git describe --dirty" did not refresh the index before checking the
state of the working tree files.
* "git ls-files ../$path" that is run from a subdirectory reported errors
incorrectly when there is no such path that matches the given pathspec.
* "git mergetool" could loop forever prompting when nothing can be read
from the standard input.
Also contains minor fixes and documentation updates.

View File

@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.7.6.3/git.html[documentation for release 1.7.6.3]
* link:v1.7.6.4/git.html[documentation for release 1.7.6.4]
* release notes for
link:RelNotes/1.7.6.4.txt[1.7.6.4],
link:RelNotes/1.7.6.3.txt[1.7.6.3],
link:RelNotes/1.7.6.2.txt[1.7.6.2],
link:RelNotes/1.7.6.1.txt[1.7.6.1],