From 9504f3d3d2e62cb6fba9e7c61c6fe69dec9053a4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 Jan 2010 13:29:21 -0800 Subject: [PATCH] Git 1.6.6.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.6.1.txt | 19 +++++++++++++------ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Documentation/RelNotes-1.6.6.1.txt b/Documentation/RelNotes-1.6.6.1.txt index 406fbc4e0f..f1d0a4ae2d 100644 --- a/Documentation/RelNotes-1.6.6.1.txt +++ b/Documentation/RelNotes-1.6.6.1.txt @@ -4,8 +4,16 @@ Git v1.6.6.1 Release Notes Fixes since v1.6.6 ------------------ + * "git blame" did not work well when commit lacked the author name. + * "git branch -a name" wasn't diagnosed as an error. + * "git count-objects" did not handle packfiles that are bigger than 4G on + platforms with 32-bit off_t. + + * "git checkout -m other" while on a branch that does not have any commit + segfaulted, instead of failing. + * "git fast-import" choked when fed a tag that do not point at a commit. @@ -15,6 +23,11 @@ Fixes since v1.6.6 * "git grep -L" didn't show empty files (they should never match, and they should always appear in -L output as unmatching). + * "git rebase -i" did not abort cleanly if it failed to launch the editor. + + * "git reset --hard" did not work correctly when GIT_WORK_TREE environment + variable is used to point at the root of the true work tree. + * http-backend was not listed in the command list in the documentation. * Building on FreeBSD (both 7 and 8) needs OLD_ICONV set in the Makefile @@ -22,9 +35,3 @@ Fixes since v1.6.6 * "git checkout -m some-branch" while on an unborn branch crashed. Other minor documentation updates are included. - --- -exec >/var/tmp/1 -O=v1.6.6-39-g6304c40 -echo O=$(git describe maint) -git shortlog --no-merges $O..maint diff --git a/Documentation/git.txt b/Documentation/git.txt index c05efdaa64..b6df39ba36 100644 --- 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: -* link:v1.6.6/git.html[documentation for release 1.6.6] +* link:v1.6.6.1/git.html[documentation for release 1.6.6.1] * release notes for + link:RelNotes-1.6.6.1.txt[1.6.6.1], link:RelNotes-1.6.6.txt[1.6.6]. * link:v1.6.5.8/git.html[documentation for release 1.6.5.8] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1628d986fe..4e0adcade9 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.6 +DEF_VER=v1.6.6.1 LF=' '