Expose method to clear the index

niik · niik · commit e335cd08ef55 · 2014-09-09T13:37:25.000+02:00
diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -340,5 +340,31 @@ public void CanResetIndexWithUnmergedEntriesFromTree()
                 Assert.Equal(FileStatus.Modified, repo.Index.RetrieveStatus(testFile));
             }
         }
+
+        [Fact]
+        public void CanClearTheIndex()
+        {
+            string path = CloneStandardTestRepo();
+            const string testFile = "1.txt";
+
+            // It is sufficient to check just one of the stage area changes, such as the modified file,
+            // to verify that the index has indeed been read from the tree.
+            using (var repo = new Repository(path))
+            {
+                Assert.Equal(FileStatus.Unaltered, repo.Index.RetrieveStatus(testFile));
+                Assert.NotEqual(0, repo.Index.Count);
+
+                repo.Index.Clear();
+                Assert.Equal(0, repo.Index.Count);
+
+                Assert.Equal(FileStatus.Removed | FileStatus.Untracked, repo.Index.RetrieveStatus(testFile));
+            }
+
+            // Check that the index was persisted to disk.
+            using (var repo = new Repository(path))
+            {
+                Assert.Equal(FileStatus.Removed | FileStatus.Untracked, repo.Index.RetrieveStatus(testFile));
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -612,6 +612,9 @@ internal static extern IndexReucEntrySafeHandle git_index_reuc_get_bypath(
         [DllImport(libgit2)]
         internal static extern int git_index_read_tree(IndexSafeHandle index, GitObjectSafeHandle tree);
 
+        [DllImport(libgit2)]
+        internal static extern int git_index_clear(IndexSafeHandle index);
+
         [DllImport(libgit2)]
         internal static extern int git_merge_base_many(
             out GitOid mergeBase,
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -993,6 +993,15 @@ public static void git_index_read_fromtree(Index index, GitObjectSafeHandle tree
             }
         }
 
+        public static void git_index_clear(Index index)
+        {
+            using (ThreadAffinity())
+            {
+                int res = NativeMethods.git_index_clear(index.Handle);
+                Ensure.ZeroResult(res);
+            }
+        }
+
         #endregion
 
         #region git_merge_
diff --git a/LibGit2Sharp/Index.cs b/LibGit2Sharp/Index.cs
@@ -475,6 +475,19 @@ public virtual void Reset(Tree source)
             UpdatePhysicalIndex();
         }
 
+        /// <summary>
+        /// Clears all entries the index. This is semantically equivalent to
+        /// creating an empty tree object and resetting the index to that tree.
+        /// <para>
+        ///   This overwrites all existing state in the staging area.
+        /// </para>
+        /// </summary>
+        public virtual void Clear()
+        {
+            Proxy.git_index_clear(this);
+            UpdatePhysicalIndex();
+        }
+
         private IDictionary<Tuple<string, FileStatus>, Tuple<string, FileStatus>> PrepareBatch(IEnumerable<string> leftPaths, IEnumerable<string> rightPaths)
         {
             IDictionary<Tuple<string, FileStatus>, Tuple<string, FileStatus>> dic = new Dictionary<Tuple<string, FileStatus>, Tuple<string, FileStatus>>();

Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,15 @@ public static void git_index_read_fromtree(Index index, GitObjectSafeHandle tree`
`993`	`993`	`}`
`994`	`994`	`}`
`995`	`995`
	`996`	`+ public static void git_index_clear(Index index)`
	`997`	`+ {`
	`998`	`+ using (ThreadAffinity())`
	`999`	`+ {`
	`1000`	`+ int res = NativeMethods.git_index_clear(index.Handle);`
	`1001`	`+ Ensure.ZeroResult(res);`
	`1002`	`+ }`
	`1003`	`+ }`
	`1004`	`+`
`996`	`1005`	`#endregion`
`997`	`1006`
`998`	`1007`	`#region git_merge_`