Get rid of the index entry SafeHandle

Author: carlosmn

LibGit2Sharp/Core/GitIndexEntry.cs

@@ -13,6 +13,8 @@ internal unsafe struct git_index_mtime
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct git_index_entry
     {
+        internal const ushort GIT_IDXENTRY_VALID = 0x8000;
+
         public git_index_mtime ctime;
         public git_index_mtime mtime;
         public uint dev;
@@ -26,23 +28,4 @@ internal unsafe struct git_index_entry
         public ushort extended_flags;
         public char* path;
     }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal class GitIndexEntry
-    {
-        internal const ushort GIT_IDXENTRY_VALID = 0x8000;
-
-        public GitIndexTime CTime;
-        public GitIndexTime MTime;
-        public uint Dev;
-        public uint Ino;
-        public uint Mode;
-        public uint Uid;
-        public uint Gid;
-        public uint file_size;
-        public GitOid Id;
-        public ushort Flags;
-        public ushort ExtendedFlags;
-        public IntPtr Path;
-    }
 }

LibGit2Sharp/Core/Handles/IndexEntrySafeHandle.cs

@@ -629,9 +629,9 @@ internal static extern int git_index_add_bypath(
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
 
         [DllImport(libgit2)]
-        internal static extern int git_index_add(
+        internal static extern unsafe int git_index_add(
             IndexSafeHandle index,
-            GitIndexEntry entry);
+            git_index_entry* entry);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_index_conflict_get(

LibGit2Sharp/Core/NativeMethods.cs

@@ -893,7 +893,7 @@ public static bool git_ignore_path_is_ignored(RepositorySafeHandle repo, string
 
         #region git_index_
 
-        public static void git_index_add(IndexSafeHandle index, GitIndexEntry entry)
+        public static unsafe void git_index_add(IndexSafeHandle index, git_index_entry* entry)
         {
             int res = NativeMethods.git_index_add(index, entry);
             Ensure.ZeroResult(res);

LibGit2Sharp/Core/Proxy.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.Runtime.InteropServices;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
 
@@ -270,17 +271,18 @@ public virtual ConflictCollection Conflicts
             get { return conflicts; }
         }
 
-        private void AddEntryToTheIndex(string path, ObjectId id, Mode mode)
+        private unsafe void AddEntryToTheIndex(string path, ObjectId id, Mode mode)
         {
-            var indexEntry = new GitIndexEntry
+            IntPtr pathPtr = StrictFilePathMarshaler.FromManaged(path);
+            var indexEntry = new git_index_entry
             {
-                Mode = (uint)mode,
-                Id = id.Oid,
-                Path = StrictFilePathMarshaler.FromManaged(path),
+                mode = (uint)mode,
+                path = (char*) pathPtr,
             };
+            Marshal.Copy(id.RawId, 0, new IntPtr(indexEntry.id.Id), GitOid.Size);
 
-            Proxy.git_index_add(handle, indexEntry);
-            EncodingMarshaler.Cleanup(indexEntry.Path);
+            Proxy.git_index_add(handle, &indexEntry);
+            EncodingMarshaler.Cleanup(pathPtr);
         }
 
         private string DebuggerDisplay

LibGit2Sharp/Index.cs

@@ -55,7 +55,7 @@ internal static unsafe IndexEntry BuildFromPtr(git_index_entry* entry)
                 Id = new ObjectId(entry->id.Id),
                 StageLevel = Proxy.git_index_entry_stage(entry),
                 Mode = (Mode)entry->mode,
-                AssumeUnchanged = (GitIndexEntry.GIT_IDXENTRY_VALID & entry->flags) == GitIndexEntry.GIT_IDXENTRY_VALID
+                AssumeUnchanged = (git_index_entry.GIT_IDXENTRY_VALID & entry->flags) == git_index_entry.GIT_IDXENTRY_VALID
             };
         }
 

LibGit2Sharp/IndexEntry.cs

@@ -284,7 +284,6 @@
     <Compile Include="Core\Handles\ObjectDatabaseSafeHandle.cs" />
     <Compile Include="Core\Handles\DiffSafeHandle.cs" />
     <Compile Include="Core\Handles\GitObjectSafeHandle.cs" />
-    <Compile Include="Core\Handles\IndexEntrySafeHandle.cs" />
     <Compile Include="Core\Handles\NotOwnedSafeHandleBase.cs" />
     <Compile Include="Core\Handles\OidSafeHandle.cs" />
     <Compile Include="Core\Handles\TreeBuilderSafeHandle.cs" />