summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-12-19 13:37:26 -0400
committerGitHub <noreply@github.com>2018-12-19 13:37:26 -0400
commit313440c394589af4387daa71b31821ed9b7f4462 (patch)
tree6d917126dc79052e4d903c76ac17f7d16243f6fa
parentf23dc5b29f1394928a940d7ec447f4bfd53dad1f (diff)
parent8bc913a29d9c63a0766e13324810c0d69aeb390d (diff)
downloadlibgit2-313440c394589af4387daa71b31821ed9b7f4462.tar.gz
Merge pull request #4916 from libgit2/ethomson/backport_0278
smart transport: only clear url on hard reset
-rw-r--r--src/transports/smart.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/transports/smart.c b/src/transports/smart.c
index 5fedd394e..b49e76ee9 100644
--- 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;
}