PR feedback

Author: tyrielv

GVFS/GVFS.Common/Git/LibGit2RepoInvoker.cs

@@ -87,7 +87,7 @@ public void InitializeSharedRepo()
             this.GetSharedRepo()?.ObjectExists("30380be3963a75e4a34e10726795d644659e1129");
         }
 
-        public bool GetConfigBoolWithFallback(string key, bool defaultValue)
+        public bool GetConfigBoolOrDefault(string key, bool defaultValue)
         {
             bool? value = defaultValue;
             if (this.TryInvoke(repo => repo.GetConfigBool(key), out value))

GVFS/GVFS.Common/GitStatusCache.cs

@@ -342,7 +342,7 @@ private void RebuildStatusCacheIfNeeded(bool ignoreBackoff)
         private void UpdateHydrationSummary()
         {
             bool enabled = TEST_EnableHydrationSummaryOverride
-                ?? this.context.Repository.LibGit2RepoInvoker.GetConfigBoolWithFallback(GVFSConstants.GitConfig.ShowHydrationStatus, GVFSConstants.GitConfig.ShowHydrationStatusDefault);
+                ?? this.context.Repository.LibGit2RepoInvoker.GetConfigBoolOrDefault(GVFSConstants.GitConfig.ShowHydrationStatus, GVFSConstants.GitConfig.ShowHydrationStatusDefault);
             if (!enabled)
             {
                 return;

GVFS/GVFS.Common/Maintenance/PrefetchStep.cs

@@ -56,7 +56,7 @@ public bool TryPrefetchCommitsAndTrees(out string error, GitProcess gitProcess =
                     return false;
                 }
 
-                var trustPackIndexes = this.Context.Repository.LibGit2RepoInvoker.GetConfigBoolWithFallback(GVFSConstants.GitConfig.TrustPackIndexes, GVFSConstants.GitConfig.TrustPackIndexesDefault);
+                var trustPackIndexes = this.Context.Repository.LibGit2RepoInvoker.GetConfigBoolOrDefault(GVFSConstants.GitConfig.TrustPackIndexes, GVFSConstants.GitConfig.TrustPackIndexesDefault);
 
                 if (!this.GitObjects.TryDownloadPrefetchPacks(gitProcess, maxGoodTimeStamp, trustPackIndexes, out packIndexes))
                 {

GVFS/GVFS.Hooks/Program.cs

@@ -112,7 +112,7 @@ private static bool ConfigurationAllowsHydrationStatus()
         {
             using (LibGit2RepoInvoker repo = new LibGit2RepoInvoker(NullTracer.Instance, normalizedCurrentDirectory))
             {
-                return repo.GetConfigBoolWithFallback(GVFSConstants.GitConfig.ShowHydrationStatus, GVFSConstants.GitConfig.ShowHydrationStatusDefault);
+                return repo.GetConfigBoolOrDefault(GVFSConstants.GitConfig.ShowHydrationStatus, GVFSConstants.GitConfig.ShowHydrationStatusDefault);
             }
         }
 

GVFS/GVFS/CommandLine/CloneVerb.cs

@@ -121,6 +121,7 @@ public override void Execute()
 
                 CacheServerInfo cacheServer = null;
                 ServerGVFSConfig serverGVFSConfig = null;
+                bool trustPackIndexes;
 
                 using (JsonTracer tracer = new JsonTracer(GVFSConstants.GVFSEtwProviderName, "GVFSClone"))
                 {
@@ -216,18 +217,17 @@ public override void Execute()
                     {
                         tracer.RelatedError(cloneResult.ErrorMessage);
                     }
+
+                    using (var repo = new LibGit2RepoInvoker(tracer, enlistment.WorkingDirectoryBackingRoot))
+                    {
+                        trustPackIndexes = repo.GetConfigBoolOrDefault(GVFSConstants.GitConfig.TrustPackIndexes, GVFSConstants.GitConfig.TrustPackIndexesDefault);
+                    }
                 }
 
                 if (cloneResult.Success)
                 {
                     if (!this.NoPrefetch)
                     {
-                        bool trustPackIndexes;
-                        using (var repo = new LibGit2RepoInvoker(NullTracer.Instance, enlistment.WorkingDirectoryBackingRoot))
-                        {
-                            trustPackIndexes = repo.GetConfigBoolWithFallback(GVFSConstants.GitConfig.TrustPackIndexes, GVFSConstants.GitConfig.TrustPackIndexesDefault);
-                        }
-                        
                         /* If pack indexes are not trusted, the prefetch can take a long time.
                          * We will run the prefetch command in the background.
                          */