Merge branch 'rj/cygwin-exit'

ttaylorr · ttaylorr · commit 787297b3960d · 2024-11-01T12:53:19.000-04:00
Treat ECONNABORTED the same as ECONNRESET in 'git credential-cache' to
work around a possible Cygwin regression. This resolves a race condition
caused by changes in Cygwin's handling of socket closures, allowing the
client to exit cleanly when encountering ECONNABORTED.

* rj/cygwin-exit:
  credential-cache: treat ECONNABORTED like ECONNRESET
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
@@ -30,7 +30,7 @@ static int connection_fatally_broken(int error)
 
 static int connection_closed(int error)
 {
-	return (error == ECONNRESET);
+	return error == ECONNRESET || error == ECONNABORTED;
 }
 
 static int connection_fatally_broken(int error)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ static int connection_fatally_broken(int error)`
`30`	`30`
`31`	`31`	`static int connection_closed(int error)`
`32`	`32`	`{`
`33`		`- return (error == ECONNRESET);`
	`33`	`+ return error == ECONNRESET \|\| error == ECONNABORTED;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`static int connection_fatally_broken(int error)`