Submodule.Stage() > SubmoduleCollection.TryStage()

Author: dahlbyk

LibGit2Sharp.Tests/SubmoduleFixture.cs

@@ -107,27 +107,6 @@ public void CanEnumerateRepositorySubmodules()
             }
         }
 
-        [Theory]
-        [InlineData("sm_changed_head")]
-        [InlineData("sm_changed_head/")]
-        public void CanStageChangeInSubmoduleViaSubmoduleStage(string submodulePath)
-        {
-            var path = BuildTemporarySubmoduleClone();
-
-            using (var repo = new Repository(path))
-            {
-                var submodule = repo.Submodules[submodulePath];
-
-                var statusBefore = submodule.RetrieveStatus();
-                Assert.Equal(SubmoduleStatus.WorkDirModified, statusBefore & SubmoduleStatus.WorkDirModified);
-
-                submodule.Stage();
-
-                var statusAfter = submodule.RetrieveStatus();
-                Assert.Equal(SubmoduleStatus.IndexModified, statusAfter & SubmoduleStatus.IndexModified);
-            }
-        }
-
         [Theory]
         [InlineData("sm_changed_head")]
         // [InlineData("sm_changed_head/")] // AmbiguousSpecificationException - Do we want to support this?

LibGit2Sharp/Index.cs

@@ -170,17 +170,9 @@ public virtual void Stage(IEnumerable<string> paths)
                 {
                     RemoveFromIndex(relativePath);
                 }
-                else
+                else if (!repo.Submodules.TryStage(relativePath, true))
                 {
-                    var submodule = repo.Submodules[relativePath];
-                    if (submodule != null)
-                    {
-                        submodule.Stage();
-                    }
-                    else
-                    {
-                        AddToIndex(relativePath);
-                    }
+                    AddToIndex(relativePath);
                 }
             }
 

LibGit2Sharp/Submodule.cs

@@ -94,19 +94,6 @@ public virtual SubmoduleUpdate UpdateRule
             get { return Proxy.git_submodule_update(handle); }
         }
 
-        /// <summary>
-        ///   Add current submodule HEAD commit to index of superproject.
-        /// </summary>
-        public virtual void Stage()
-        {
-            Stage(true);
-        }
-
-        internal virtual void Stage(bool writeIndex)
-        {
-            Proxy.git_submodule_add_to_index(handle, writeIndex);
-        }
-
         /// <summary>
         ///   Retrieves the state of this submodule in the working directory compared to the staging area and the latest commmit.
         /// </summary>

LibGit2Sharp/SubmoduleCollection.cs

@@ -63,6 +63,18 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
 
+        internal bool TryStage(string relativePath, bool writeIndex)
+        {
+            using (var handle = Proxy.git_submodule_lookup(repo.Handle, relativePath))
+            {
+                if (handle == null)
+                    return false;
+
+                Proxy.git_submodule_add_to_index(handle, writeIndex);
+                return true;
+            }
+        }
+
         private string DebuggerDisplay
         {
             get