diff options
authorJunio C Hamano <>2016-01-04 22:06:59 (GMT)
committerJunio C Hamano <>2016-01-04 22:06:59 (GMT)
commit3e9226acc81dc401604a78cc9ebaeefe195808c0 (patch)
parent58639907993942d7b8c5477e58ccac72d242c10c (diff)
parent833e48259e23aea76f3765d28d1b2200332301f7 (diff)
Sync with 2.6.5
2 files changed, 21 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.6.5.txt b/Documentation/RelNotes/2.6.5.txt
index 3e6331d..f0924b6 100644
--- a/Documentation/RelNotes/2.6.5.txt
+++ b/Documentation/RelNotes/2.6.5.txt
@@ -35,5 +35,24 @@ Fixes since v2.6.4
* The exit code of git-fsck did not reflect some types of errors
found in packed objects, which has been corrected.
+ * The completion script (in contrib/) used to list "git column"
+ (which is not an end-user facing command) as one of the choices
+ * Improve error reporting when SMTP TLS fails.
+ * When getpwuid() on the system returned NULL (e.g. the user is not
+ in the /etc/passwd file or other uid-to-name mappings), the
+ codepath to find who the user is to record it in the reflog barfed
+ and died. Loosen the check in this codepath, which already accepts
+ questionable ident string (e.g. host part of the e-mail address is
+ obviously bogus), and in general when we operate fmt_ident() function
+ in non-strict mode.
+ * "git symbolic-ref" forgot to report a failure with its exit status.
+ * History traversal with "git log --source" that starts with an
+ annotated tag failed to report the tag as "source", due to an
+ old regression in the command line parser back in v2.2 days.
Also contains typofixes, documentation updates and trivial code
diff --git a/Documentation/git.txt b/Documentation/git.txt
index cbf157b..6668172 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.6.4/git.html[documentation for release 2.6.4]
+* link:v2.6.5/git.html[documentation for release 2.6.5]
* release notes for
+ link:RelNotes/2.6.5.txt[2.6.5],