Merge branch 'new-error-handling' into development

Conflicts:
	.travis.yml
	include/git2/diff.h
	src/config_file.c
	src/diff.c
	src/diff_output.c
	src/mwindow.c
	src/path.c
	tests-clar/clar_helpers.c
	tests-clar/object/tree/frompath.c
	tests/t00-core.c
	tests/t03-objwrite.c
	tests/t08-tag.c
	tests/t10-refs.c
	tests/t12-repo.c
	tests/t18-status.c
	tests/test_helpers.c
	tests/test_main.c

1 files changed, 4 insertions, 4 deletions

diff --git a/src/transport.c b/src/transport.c
index 4910f2433..0c88e44d3 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -54,7 +54,8 @@ static git_transport_cb transport_find_fn(const char *url)
 int git_transport_dummy(git_transport **transport)
 {
 	GIT_UNUSED(transport);
-	return git__throw(GIT_ENOTIMPLEMENTED, "This protocol isn't implemented. Sorry");
+	giterr_set(GITERR_NET, "This transport isn't implemented. Sorry");
+	return -1;
 }
 
 int git_transport_new(git_transport **out, const char *url)
@@ -70,11 +71,10 @@ int git_transport_new(git_transport **out, const char *url)
 
 	error = fn(&transport);
 	if (error < GIT_SUCCESS)
-		return git__rethrow(error, "Failed to create new transport");
+		return error;
 
 	transport->url = git__strdup(url);
-	if (transport->url == NULL)
-		return GIT_ENOMEM;
+	GITERR_CHECK_ALLOC(transport->url);
 
 	*out = transport;