From 8de65185e873d361ede4d6994ef257e4ac55f37d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Jan 2010 21:14:41 -0800 Subject: [PATCH 1/3] Fix mis-backport of t7002 The original patch that became cfe370c (grep: do not segfault when -f is used, 2009-10-16), was made against "maint" or newer branch back then, but the fix addressed the issue that was present as far as in 1.6.4 series. The maintainer backported the patch to the 1.6.4 maintenance branch, but failed to notice that the new tests assumed the setup done by the script in "maint", which did quite a lot more than the same test script in 1.6.4 series, and the output didn't match the expected result. This should fix it. Signed-off-by: Junio C Hamano --- t/t7002-grep.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index 5f91d82297..7a5f28a326 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -25,13 +25,17 @@ test_expect_success setup ' echo foo mmap bar_mmap echo foo_mmap bar mmap baz } >file && + echo vvv >v && echo ww w >w && echo x x xx x >x && echo y yy >y && echo zzz > z && mkdir t && echo test >t/t && - git add file w x y z t/t hello.c && + echo vvv >t/v && + mkdir t/a && + echo vvv >t/a/v && + git add . && test_tick && git commit -m initial ' From 35eabd1579726d594e84fc8328a5c87693dd065a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 Jan 2010 12:44:59 -0800 Subject: [PATCH 2/3] Git 1.6.5.8 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.5.8.txt | 28 ++++++++++++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes-1.6.5.8.txt diff --git a/Documentation/RelNotes-1.6.5.8.txt b/Documentation/RelNotes-1.6.5.8.txt new file mode 100644 index 0000000000..8b24bebb96 --- /dev/null +++ b/Documentation/RelNotes-1.6.5.8.txt @@ -0,0 +1,28 @@ +Git v1.6.5.8 Release Notes +========================== + +Fixes since v1.6.5.7 +-------------------- + +* "git count-objects" did not handle packfiles that are bigger than 4G on + platforms with 32-bit off_t. + +* "git rebase -i" did not abort cleanly if it failed to launch the editor. + +* "git blame" did not work well when commit lacked the author name. + +* "git fast-import" choked when handling a tag that points at an object + that is not a commit. + +* "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. + +* "git grep" fed a buffer that is not NUL-terminated to underlying + regexec(). + +* "git checkout -m other" while on a branch that does not have any commit + segfaulted, instead of failing. + +* "git branch -a other" should have diagnosed the command as an error. + +Other minor documentation updates are also included. diff --git a/Documentation/git.txt b/Documentation/git.txt index ff31095093..46558c8a49 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.5.7/git.html[documentation for release 1.6.5.7] +* link:v1.6.5.8/git.html[documentation for release 1.6.5.8] * release notes for + link:RelNotes-1.6.5.8.txt[1.6.5.8], link:RelNotes-1.6.5.7.txt[1.6.5.7], link:RelNotes-1.6.5.6.txt[1.6.5.6], link:RelNotes-1.6.5.5.txt[1.6.5.5], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e918ffe326..52b058a586 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.5.7 +DEF_VER=v1.6.5.8 LF=' ' diff --git a/RelNotes b/RelNotes index b1e74fb27b..f60e868f47 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.5.7.txt \ No newline at end of file +Documentation/RelNotes-1.6.5.8.txt \ No newline at end of file From 9504f3d3d2e62cb6fba9e7c61c6fe69dec9053a4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 Jan 2010 13:29:21 -0800 Subject: [PATCH 3/3] 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=' '