Fixup submodule properties

Fixup drift between LibGit2Sharp and lg2.

Author: jamill

LibGit2Sharp.Tests/SubmoduleFixture.cs

@@ -289,5 +289,25 @@ public void CanUpdateSubmoduleAfterCheckout()
                 Assert.Equal((ObjectId)"5e4963595a9774b90524d35a807169049de8ccad", submodule.WorkDirCommitId);
             }
         }
+
+        [Fact]
+        public void CanReadSubmoduleProperties()
+        {
+            var path = SandboxSubmoduleSmallTestRepo();
+            string submoduleName = "submodule_target_wd";
+
+            using (var repo = new Repository(path))
+            {
+                var submodule = repo.Submodules[submoduleName];
+
+                Assert.Equal(SubmoduleUpdate.Checkout, submodule.UpdateRule);
+                Assert.Equal(SubmoduleIgnore.None, submodule.IgnoreRule);
+
+                // Libgit2 currently returns No by default, which seems incorrect -
+                // I would expect OnDemand. For now, just test that we can query
+                // lg2 for this property.
+                Assert.Equal(SubmoduleRecurse.No, submodule.FetchRecurseSubmodulesRule);
+            }
+        }
     }
 }

LibGit2Sharp/Core/NativeMethods.cs

@@ -1397,7 +1397,7 @@ internal static extern SubmoduleUpdate git_submodule_update_strategy(
             SubmoduleSafeHandle submodule);
 
         [DllImport(libgit2)]
-        internal static extern bool git_submodule_fetch_recurse_submodules(
+        internal static extern SubmoduleRecurse git_submodule_fetch_recurse_submodules(
             SubmoduleSafeHandle submodule);
 
         [DllImport(libgit2)]

LibGit2Sharp/Core/Proxy.cs

@@ -2764,7 +2764,7 @@ public static SubmoduleUpdate git_submodule_update_strategy(SubmoduleSafeHandle
             return NativeMethods.git_submodule_update_strategy(submodule);
         }
 
-        public static bool git_submodule_fetch_recurse_submodules(SubmoduleSafeHandle submodule)
+        public static SubmoduleRecurse git_submodule_fetch_recurse_submodules(SubmoduleSafeHandle submodule)
         {
             return NativeMethods.git_submodule_fetch_recurse_submodules(submodule);
         }

LibGit2Sharp/LibGit2Sharp.csproj

@@ -134,6 +134,7 @@
     <Compile Include="Log.cs" />
     <Compile Include="LogConfiguration.cs" />
     <Compile Include="LogLevel.cs" />
+    <Compile Include="SubmoduleRecurse.cs" />
     <Compile Include="SubmoduleUpdateOptions.cs" />
     <Compile Include="UnbornBranchException.cs" />
     <Compile Include="LockedFileException.cs" />

LibGit2Sharp/Submodule.cs

@@ -21,7 +21,7 @@ public class Submodule : IEquatable<Submodule>, IBelongToARepository
         private readonly ILazy<ObjectId> headCommitId;
         private readonly ILazy<ObjectId> indexCommitId;
         private readonly ILazy<ObjectId> workdirCommitId;
-        private readonly ILazy<bool> fetchRecurseSubmodulesRule;
+        private readonly ILazy<SubmoduleRecurse> fetchRecurseSubmodulesRule;
         private readonly ILazy<SubmoduleIgnore> ignoreRule;
         private readonly ILazy<SubmoduleUpdate> updateRule;
 
@@ -85,7 +85,7 @@ internal Submodule(Repository repo, string name, string path, string url)
         /// Note that at this time, LibGit2Sharp does not honor this setting and the
         /// fetch functionality current ignores submodules.
         /// </summary>
-        public virtual bool FetchRecurseSubmodulesRule { get { return fetchRecurseSubmodulesRule.Value; } }
+        public virtual SubmoduleRecurse FetchRecurseSubmodulesRule { get { return fetchRecurseSubmodulesRule.Value; } }
 
         /// <summary>
         /// The ignore rule of the submodule.

LibGit2Sharp/SubmoduleRecurse.cs

@@ -0,0 +1,25 @@
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Submodule recurse rule options.
+    /// </summary>
+    public enum SubmoduleRecurse
+    {
+        /// <summary>
+        /// Reset to the value in the config.
+        /// </summary>
+        Reset = -1,
+        /// <summary>
+        /// Do not recurse into submodules.
+        /// </summary>
+        No = 0,
+        /// <summary>
+        /// Recurse into submodules.
+        /// </summary>
+        Yes = 1,
+        /// <summary>
+        /// Recurse into submodules only when commit not already in local clone.
+        /// </summary>
+        OnDemand = 2,
+    }
+}

LibGit2Sharp/SubmoduleUpdate.cs

@@ -8,22 +8,27 @@ public enum SubmoduleUpdate
         /// <summary>
         /// Reset to the last saved update rule.
         /// </summary>
-        Default = -1,
+        Reset = -1,
         /// <summary>
-        /// Checkout the commit recorded in the superproject.
+        /// Only used when you don't want to specify any particular update
+        /// rule.
         /// </summary>
-        Checkout = 0,
+        Unspecified = 0,
+        /// <summary>
+        /// This is the default - checkout the commit recorded in the superproject.
+        /// </summary>
+        Checkout = 1,
         /// <summary>
         /// Rebase the current branch of the submodule onto the commit recorded in the superproject.
         /// </summary>
-        Rebase = 1,
+        Rebase = 2,
         /// <summary>
         /// Merge the commit recorded in the superproject into the current branch of the submodule.
         /// </summary>
-        Merge = 2,
+        Merge = 3,
         /// <summary>
         /// Do not update the submodule.
         /// </summary>
-        None = 3,
+        None = 4,
     }
 }