Merge pull request #534 from libgit2/vmg/xdiff-next

Vicent Marti · Vicent Marti · commit 3267567cf7eb · 2015-10-06T11:06:08.000+02:00
XDiff upstream changes
diff --git a/ext/rugged/rugged_remote.c b/ext/rugged/rugged_remote.c
@@ -264,7 +264,7 @@ static VALUE rb_git_remote_ls(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 
-	if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks)) ||
+	if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL)) ||
 	    (error = git_remote_ls(&heads, &heads_len, remote)))
 		goto cleanup;
 
@@ -458,7 +458,7 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 
-	error = git_remote_connect(remote, direction, &callbacks);
+	error = git_remote_connect(remote, direction, &callbacks, NULL);
 	git_remote_disconnect(remote);
 
 	if (payload.exception)
diff --git a/vendor/libgit2 b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 9562ebcd6b26e321f638a2a9795e2c1b493e033e
+Subproject commit ac69a82358ef444de433a8e0af62a4b6bd5c2c4e
