summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-28 11:19:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-28 11:19:57 -0700
commitc415fb791b318832f52494b75d99602a7a8d604b (patch)
treedb02ffd225a7d62b0b1a74734a0d0c867bc01938
parentMingw: verify both ends of the pipe () call (diff)
downloadtgif-c415fb791b318832f52494b75d99602a7a8d604b.tar.xz
Git 2.5.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.5.1.txt16
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 19 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.5.1.txt b/Documentation/RelNotes/2.5.1.txt
index 3c468519b9..b70553308a 100644
--- a/Documentation/RelNotes/2.5.1.txt
+++ b/Documentation/RelNotes/2.5.1.txt
@@ -45,5 +45,21 @@ Fixes since v2.5
stable, which was a no-no. Apply a workaround to force a
particular date format.
+ * "git clone $URL" in recent releases of Git contains a regression in
+ the code that invents a new repository name incorrectly based on
+ the $URL. This has been corrected.
+ (merge db2e220 jk/guess-repo-name-regression-fix later to maint).
+
+ * Running tests with the "-x" option to make them verbose had some
+ unpleasant interactions with other features of the test suite.
+ (merge 9b5fe78 jk/test-with-x later to maint).
+
+ * "git pull" in recent releases of Git has a regression in the code
+ that allows custom path to the --upload-pack=<program>. This has
+ been corrected.
+
+ * pipe() emulation used in Git for Windows looked at a wrong variable
+ when checking for an error from an _open_osfhandle() call.
+
Also contains typofixes, documentation updates and trivial code
clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8b7e3a2d6e..5a78d77533 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.5.0/git.html[documentation for release 2.5]
+* link:v2.5.1/git.html[documentation for release 2.5.1]
* release notes for
+ link:RelNotes/2.5.1.txt[2.5.1],
link:RelNotes/2.5.0.txt[2.5].
* link:v2.4.8/git.html[documentation for release 2.4.8]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5cadf44e1a..5e23aba39c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.0
+DEF_VER=v2.5.1
LF='
'