Sync with 2.5.1

gitster · gitster · commit aecce6d0eff6 · 2015-08-28T12:32:45.000-07:00
diff --git 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
@@ -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/compat/mingw.c b/compat/mingw.c
@@ -681,7 +681,7 @@ int pipe(int filedes[2])
 		return -1;
 	}
 	filedes[1] = _open_osfhandle((int)h[1], O_NOINHERIT);
-	if (filedes[0] < 0) {
+	if (filedes[1] < 0) {
 		close(filedes[0]);
 		CloseHandle(h[1]);
 		return -1;

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ int pipe(int filedes[2])`
`681`	`681`	`return -1;`
`682`	`682`	`}`
`683`	`683`	`filedes[1] = _open_osfhandle((int)h[1], O_NOINHERIT);`
`684`		`- if (filedes[0] < 0) {`
	`684`	`+ if (filedes[1] < 0) {`
`685`	`685`	`close(filedes[0]);`
`686`	`686`	`CloseHandle(h[1]);`
`687`	`687`	`return -1;`