Delegate repo.Reset() to libgit2

Author: nulltoken

LibGit2Sharp/Core/NativeMethods.cs

@@ -672,6 +672,12 @@ internal static extern int git_repository_set_workdir(
         [return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FilePathMarshaler))]
         internal static extern FilePath git_repository_workdir(RepositorySafeHandle repository);
 
+        [DllImport(libgit2)]
+        internal static extern int git_reset(
+            RepositorySafeHandle repo,
+            GitObjectSafeHandle target,
+            ResetOptions reset_type);
+
         [DllImport(libgit2)]
         internal static extern int git_revparse_single(
             out GitObjectSafeHandle obj,

LibGit2Sharp/Core/Proxy.cs

@@ -1274,6 +1274,23 @@ public static FilePath git_repository_workdir(RepositorySafeHandle repo)
 
         #endregion
 
+        #region git_reset_
+
+        public static void git_reset(
+            RepositorySafeHandle repo,
+            ObjectId commitishId,
+            ResetOptions resetKind)
+        {
+            using (ThreadAffinity())
+            using (var osw = new ObjectSafeWrapper(commitishId, repo))
+            {
+                int res = NativeMethods.git_reset(repo, osw.ObjectPtr, resetKind);
+                Ensure.Success(res);
+            }
+        }
+
+        #endregion
+
         #region git_revparse_
 
         public static GitObjectSafeHandle git_revparse_single(RepositorySafeHandle repo, string objectish)

LibGit2Sharp/Repository.cs

@@ -429,18 +429,6 @@ public Branch Checkout(Branch branch)
             return branch;
         }
 
-        private void CheckoutTreeForce(ObjectId treeId)
-        {
-            var opts = new GitCheckoutOpts
-                           {
-                               checkout_strategy = CheckoutStrategy.GIT_CHECKOUT_CREATE_MISSING |
-                                                   CheckoutStrategy.GIT_CHECKOUT_OVERWRITE_MODIFIED |
-                                                   CheckoutStrategy.GIT_CHECKOUT_REMOVE_UNTRACKED
-                           };
-            GitIndexerStats stats = new GitIndexerStats();
-            Proxy.git_checkout_tree(handle, treeId, opts, ref stats);
-        }
-
         /// <summary>
         ///   Sets the current <see cref = "Head" /> to the specified commit and optionally resets the <see cref = "Index" /> and
         ///   the content of the working tree to match.
@@ -451,31 +439,9 @@ public void Reset(ResetOptions resetOptions, string commitish = "HEAD")
         {
             Ensure.ArgumentNotNullOrEmptyString(commitish, "commitish");
 
-            if (resetOptions.Has(ResetOptions.Mixed) && Info.IsBare)
-            {
-                throw new BareRepositoryException("Mixed reset is not allowed in a bare repository");
-            }
-
-            Commit commit = LookupCommit(commitish);
-
-            //TODO: Check for unmerged entries
-
-            string refToUpdate = Info.IsHeadDetached ? "HEAD" : Head.CanonicalName;
-            Refs.UpdateTarget(refToUpdate, commit.Sha);
-
-            if (resetOptions == ResetOptions.Soft)
-            {
-                return;
-            }
-
-            Index.ReplaceContentWithTree(commit.Tree);
-
-            if (resetOptions == ResetOptions.Mixed)
-            {
-                return;
-            }
+            GitObject obj = Lookup(commitish, GitObjectType.Any, LookUpOptions.ThrowWhenNoGitObjectHasBeenFound);
 
-            CheckoutTreeForce(commit.Tree.Id);
+            Proxy.git_reset(handle, obj.Id, resetOptions);
         }
 
         /// <summary>

LibGit2Sharp/ResetOptions.cs

@@ -8,7 +8,7 @@ public enum ResetOptions
         /// <summary>
         ///   Moves the branch pointed to by HEAD to the specified commit object.
         /// </summary>
-        Soft,
+        Soft = 1,
 
         /// <summary>
         ///   Moves the branch pointed to by HEAD to the specified commit object and resets the index