Sync with 1.6.6.2

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

diff --git a/Documentation/RelNotes-1.6.6.2.txt b/Documentation/RelNotes-1.6.6.2.txt
new file mode 100644 (file)
index 0000000..1a0ba37
--- /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 <file>" 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-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index d9a3326f58c0324b6e32fb130325213a413d35ab..a8c0b80613496b5b6d25dd5aa6cdc9245a171609 100644 (file)
--- 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

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8c5f5b05cb986960db392a0469cff357fa866211..b7df54dfa7764557273c7edcc0ec04fa396dca43 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:
 
-* 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/t/t8003-blame.sh b/t/t8003-blame.sh
index 4a8db74f7e09a143e73d647479ef62af91547865..3bbddd03cbfcf5cbdff6ed2987d68da9402ed993 100755 (executable)
--- 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