From 8ff883029a97b38b893b15199393d0e4e7190c0d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 10 Feb 2010 10:18:55 -0800 Subject: [PATCH 1/3] check-ref-format documentation: fix enumeration mark-up The last item in the enumerated refname rule was mistakenly made into a sub-item of the 7th one. It should be the 8th one in the list on its own. Signed-off-by: Junio C Hamano --- Documentation/git-check-ref-format.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index 0aeef24780..3f7835f4a7 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -43,7 +43,7 @@ imposes the following rules on how references are named: . They cannot contain a sequence `@{`. -- They cannot contain a `\\`. +. They cannot contain a `\\`. These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used From 33f0ea42e12d3f54ef8ff53580649885c1503d05 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 9 Feb 2010 10:06:33 -0800 Subject: [PATCH 2/3] t8003: check exit code of command and error message separately Shell reports exit status only from the most downstream command in a pipeline. In these tests, we want to make sure that the command fails in a controlled way, and produces a correct error message. This issue was known by Jay who submitted the patch, and also was pointed out by Hannes during the review process, but I forgot to fix it up before applying. Sorry about that. Signed-off-by: Junio C Hamano --- t/t8003-blame.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh index 4a8db74f7e..3bbddd03cb 100755 --- a/t/t8003-blame.sh +++ b/t/t8003-blame.sh @@ -158,11 +158,13 @@ EOF ' test_expect_success 'blame -L with invalid start' ' - test_must_fail git blame -L5 tres 2>&1 | grep "has only 2 lines" + test_must_fail git blame -L5 tres 2>errors && + grep "has only 2 lines" errors ' test_expect_success 'blame -L with invalid end' ' - git blame -L1,5 tres 2>&1 | grep "has only 2 lines" + test_must_fail git blame -L1,5 tres 2>errors && + grep "has only 2 lines" errors ' test_done From 4133fd25525022f99d2c7ba339618433bdd919fe Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 10 Feb 2010 13:44:11 -0800 Subject: [PATCH 3/3] Git 1.6.6.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.6.2.txt | 46 ++++++++++++++++++++++++++++++ Documentation/git.txt | 3 +- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes-1.6.6.2.txt diff --git a/Documentation/RelNotes-1.6.6.2.txt b/Documentation/RelNotes-1.6.6.2.txt new file mode 100644 index 0000000000..1a0ba377cf --- /dev/null +++ b/Documentation/RelNotes-1.6.6.2.txt @@ -0,0 +1,46 @@ +Git v1.6.6.2 Release Notes +========================== + +Fixes since v1.6.6.2 +-------------------- + + * recursive merge didn't correctly diagnose its own programming errors, + and instead caused the caller to segfault. + + * The new "smart http" aware clients probed the web servers to see if + they support smart http, but did not fall back to dumb http transport + correctly with some servers. + + * Time based reflog syntax e.g. "@{yesterday}" didn't diagnose a misspelled + time specification and instead assumed "@{now}". + + * "git archive HEAD -- no-such-directory" produced an empty archive + without complaining. + + * "git blame -L start,end -- file" misbehaved when given a start that is + larger than the number of lines in the file. + + * "git checkout -m" didn't correctly call custom merge backend supplied + by the end user. + + * "git config -f " misbehaved when run from a subdirectory. + + * "git cvsserver" didn't like having regex metacharacters (e.g. '+') in + CVSROOT environment. + + * "git fast-import" did not correctly handle large blobs that may + bust the pack size limit. + + * "git gui" is supposed to work even when launched from inside a .git + directory. + + * "git gui" misbehaved when applying a hunk that ends with deletion. + + * "git imap-send" did not honor imap.preformattedHTML as documented. + + * "git log" family incorrectly showed the commit notes unconditionally by + mistake, which was especially irritating when running "git log --oneline". + + * "git status" shouldn't require an write access to the repository. + +Other minor documentation updates are included. diff --git a/Documentation/git.txt b/Documentation/git.txt index b6df39ba36..b4c2bcc45b 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.1/git.html[documentation for release 1.6.6.1] +* link:v1.6.6.2/git.html[documentation for release 1.6.6.2] * release notes for + link:RelNotes-1.6.6.2.txt[1.6.6.2], link:RelNotes-1.6.6.1.txt[1.6.6.1], link:RelNotes-1.6.6.txt[1.6.6]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 4e0adcade9..081be51a9e 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.6.1 +DEF_VER=v1.6.6.2 LF=' ' diff --git a/RelNotes b/RelNotes index d57124075c..692968f170 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.6.1.txt \ No newline at end of file +Documentation/RelNotes-1.6.6.2.txt \ No newline at end of file