Git 2.5.1

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

diff --git a/Documentation/RelNotes/2.5.1.txt b/Documentation/RelNotes/2.5.1.txt
index 3c468519b92f9982dd4519ffa0916983cec9e956..b70553308af80bc526158d768c962cb075aec2b2 100644 (file)
--- 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 8b7e3a2d6ebdefef3cde8c7bfc63accb84a8e63c..5a78d77533f18c96a0fbee7ac97ba8478eb169ca 100644 (file)
--- 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 5cadf44e1a5372c480eeec43683210964ad8c1ca..5e23aba39c9fad611b292d2e7f7c2bf4ce717e8f 100755 (executable)
--- 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='
 '