summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-04 22:06:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-04 22:06:00 (GMT)
commit833e48259e23aea76f3765d28d1b2200332301f7 (patch)
tree83823e5eb365e058c5ded6ed5ccb1aabd5a47a16
parente3073cf895f335c6544d17b143c6e272436d149f (diff)
downloadgit-833e48259e23aea76f3765d28d1b2200332301f7.zip
git-833e48259e23aea76f3765d28d1b2200332301f7.tar.gz
git-833e48259e23aea76f3765d28d1b2200332301f7.tar.bz2
Git 2.6.5v2.6.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.6.5.txt19
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 22 insertions, 2 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
clean-ups.
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],
link:RelNotes/2.6.4.txt[2.6.4],
link:RelNotes/2.6.3.txt[2.6.3],
link:RelNotes/2.6.2.txt[2.6.2],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f2a001f..7ed4820 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.4
+DEF_VER=v2.6.5
LF='
'