Merge pull request #4916 from libgit2/ethomson/backport_0278

smart transport: only clear url on hard reset

Merge pull request #4916 from libgit2/ethomson/backport_0278
smart transport: only clear url on hard reset
313440c3 · Edward Thomson · GitHub · f23dc5b2 · 8bc913a2 · 313440c3
Unverified Commit 313440c3 authored Dec 19, 2018 by Edward Thomson Committed by GitHub Dec 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

src/transports/smart.c
+4 -5

No files found.
--- a/src/transports/smart.c
+++ b/src/transports/smart.c
@@ -45,14 +45,13 @@ GIT_INLINE(int) git_smart__reset_stream(transport_smart *t, bool close_subtransp
 		t->current_stream = NULL;
 	}

-	if (t->url) {
+	if (close_subtransport) {
 		git__free(t->url);
 		t->url = NULL;
-	}

-	if (close_subtransport &&
-		t->wrapped->close(t->wrapped) < 0)
-		return -1;
+		if (t->wrapped->close(t->wrapped) < 0)
+			return -1;
+	}

 	return 0;
 }