remote: get rid of git_remote_negotiate

There is no good reason to expose the negotiation as a different step
to downloading the packfile.

Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/remote.c b/src/remote.c
index 3ff08a21e..6ac3bc168 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -206,13 +206,13 @@ int git_remote_ls(git_remote *remote, git_headarray *refs)
 	return remote->transport->ls(remote->transport, refs);
 }
 
-int git_remote_negotiate(git_remote *remote)
-{
-	return git_fetch_negotiate(remote);
-}
-
 int git_remote_download(char **filename, git_remote *remote)
 {
+	int error;
+
+	if ((error = git_fetch_negotiate(remote)) < 0)
+		return git__rethrow(error, "Error negotiating");
+
 	return git_fetch_download_pack(filename, remote);
 }