remote: don't free the remote on delete

carlosmn · carlosmn · commit 231f350d91e7 · 2014-06-06T22:55:34.000+02:00
This was a bad idea. Don't free except in the free function.
diff --git a/include/git2/remote.h b/include/git2/remote.h
@@ -618,8 +618,6 @@ GIT_EXTERN(int) git_remote_is_valid_name(const char *remote_name);
 * All remote-tracking branches and configuration settings
 * for the remote will be removed.
 *
-* once deleted, the passed remote object will be freed and invalidated.
-*
 * @param remote A valid remote
 * @return 0 on success, or an error code.
 */
diff --git a/src/remote.c b/src/remote.c
@@ -1921,8 +1921,6 @@ int git_remote_delete(git_remote *remote)
 		repo, git_remote_name(remote), NULL)) < 0)
 		return error;
 
-	git_remote_free(remote);
-
 	return 0;
 }
 
diff --git a/tests/network/remote/delete.c b/tests/network/remote/delete.c
@@ -15,6 +15,7 @@ void test_network_remote_delete__initialize(void)
 
 void test_network_remote_delete__cleanup(void)
 {
+	git_remote_free(_remote);
 	cl_git_sandbox_cleanup();
 }
 
@@ -27,7 +28,6 @@ void test_network_remote_delete__cannot_delete_an_anonymous_remote(void)
 	cl_git_fail(git_remote_delete(remote));
 
 	git_remote_free(remote);
-	git_remote_free(_remote);
 }
 
 void test_network_remote_delete__remove_remote_tracking_branches(void)

Original file line number	Diff line number	Diff line change
`@@ -618,8 +618,6 @@ GIT_EXTERN(int) git_remote_is_valid_name(const char *remote_name);`
`618`	`618`	`* All remote-tracking branches and configuration settings`
`619`	`619`	`* for the remote will be removed.`
`620`	`620`	`*`
`621`		`-* once deleted, the passed remote object will be freed and invalidated.`
`622`		`-*`
`623`	`621`	`* @param remote A valid remote`
`624`	`622`	`* @return 0 on success, or an error code.`
`625`	`623`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1921,8 +1921,6 @@ int git_remote_delete(git_remote *remote)`
`1921`	`1921`	`repo, git_remote_name(remote), NULL)) < 0)`
`1922`	`1922`	`return error;`
`1923`	`1923`
`1924`		`- git_remote_free(remote);`
`1925`		`-`
`1926`	`1924`	`return 0;`
`1927`	`1925`	`}`
`1928`	`1926`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ void test_network_remote_delete__initialize(void)`
`15`	`15`
`16`	`16`	`void test_network_remote_delete__cleanup(void)`
`17`	`17`	`{`
	`18`	`+ git_remote_free(_remote);`
`18`	`19`	`cl_git_sandbox_cleanup();`
`19`	`20`	`}`
`20`	`21`
`@@ -27,7 +28,6 @@ void test_network_remote_delete__cannot_delete_an_anonymous_remote(void)`
`27`	`28`	`cl_git_fail(git_remote_delete(remote));`
`28`	`29`
`29`	`30`	`git_remote_free(remote);`
`30`		`- git_remote_free(_remote);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`void test_network_remote_delete__remove_remote_tracking_branches(void)`