diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-06 22:55:34 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-06 22:55:34 +0200 |
commit | 231f350d91e71e3c171041a64f0d238888fad002 (patch) | |
tree | a2a20f8025f8a42a7471a9742212827cf0c09c2b | |
parent | d15445646440807a082feb54a1e92d54864137d1 (diff) | |
download | libgit2-231f350d91e71e3c171041a64f0d238888fad002.tar.gz |
remote: don't free the remote on deletecmn/remote-rename-more
This was a bad idea. Don't free except in the free function.
-rw-r--r-- | include/git2/remote.h | 2 | ||||
-rw-r--r-- | src/remote.c | 2 | ||||
-rw-r--r-- | tests/network/remote/delete.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/git2/remote.h b/include/git2/remote.h index 8d3744265..cba57c4f6 100644 --- 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 index 827c54f9d..47b61b1b1 100644 --- 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 index db55b0768..664f47a43 100644 --- 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) |