Git 1.6.6.1

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

diff --git a/Documentation/RelNotes-1.6.6.1.txt b/Documentation/RelNotes-1.6.6.1.txt
index 406fbc4e0f9bc7f95ed576769c378f76dcd10d16..f1d0a4ae2d63e258cea94f8bca09d41121f1165e 100644 (file)
--- 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
 ------------------
 
 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 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.
 
  * "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 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
  * 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.
  * "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 c05efdaa647816c7e1e306fa62aed90c80202b58..b6df39ba36eddd640c456293a0233894beb1da5c 100644 (file)
--- 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:
 
 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
 
 * 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]
   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 1628d986fe44aabf33d7b9e88082b52cb2640986..4e0adcade959a188c0d6e7d44a99b042e8280aec 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.6.6
+DEF_VER=v1.6.6.1

 
 LF='
 '
 
 LF='
 '