Get rid of the branch iterator SafeHandle

Author: carlosmn

LibGit2Sharp/Core/Handles/BranchIteratorSafeHandle.cs

@@ -166,8 +166,8 @@ internal static extern void git_branch_iterator_free(
             IntPtr iterator);
 
         [DllImport(libgit2)]
-        internal static extern int git_branch_iterator_new(
-            out BranchIteratorSafeHandle iter_out,
+        internal static extern  int git_branch_iterator_new(
+            out IntPtr iter_out,
             RepositorySafeHandle repo,
             GitBranchType branch_type);
 
@@ -182,7 +182,7 @@ internal static extern unsafe int git_branch_move(
         internal static extern int git_branch_next(
             out IntPtr ref_out,
             out GitBranchType type_out,
-            BranchIteratorSafeHandle iter);
+            IntPtr iter);
 
         [DllImport(libgit2)]
         internal static extern int git_branch_remote_name(

LibGit2Sharp/Core/NativeMethods.cs

@@ -211,11 +211,11 @@ public static unsafe void git_branch_delete(GitReferenceHandle reference)
 
         public static IEnumerable<Branch> git_branch_iterator(Repository repo, GitBranchType branchType)
         {
-            BranchIteratorSafeHandle iter;
+            IntPtr iter;
             var res = NativeMethods.git_branch_iterator_new(out iter, repo.Handle, branchType);
             Ensure.ZeroResult(res);
 
-            using (iter)
+            try
             {
                 while (true)
                 {
@@ -236,6 +236,10 @@ public static IEnumerable<Branch> git_branch_iterator(Repository repo, GitBranch
                     yield return new Branch(repo, reference, reference.CanonicalName);
                 }
             }
+            finally
+            {
+                NativeMethods.git_branch_iterator_free(iter);
+            }
         }
 
         public static void git_branch_iterator_free(IntPtr iter)

LibGit2Sharp/Core/Proxy.cs

@@ -147,7 +147,6 @@
     <Compile Include="RefSpecCollection.cs" />
     <Compile Include="Core\EncodingMarshaler.cs" />
     <Compile Include="Core\GitMergeOpts.cs" />
-    <Compile Include="Core\Handles\BranchIteratorSafeHandle.cs" />
     <Compile Include="Core\Handles\ConfigurationIteratorSafeHandle.cs" />
     <Compile Include="Core\GitBlame.cs" />
     <Compile Include="Core\Handles\BlameSafeHandle.cs" />