CloneVerb: Force download of commit and trees on failed initial checkout

microsoft · Sep 28, 2018 · f01f433 · f01f433
1 parent 0465c34
commit f01f433
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 5 deletions.
diff --git a/GVFS/GVFS/CommandLine/CloneVerb.cs b/GVFS/GVFS/CommandLine/CloneVerb.cs
@@ -567,6 +567,27 @@ private Result CreateClone(
             }
 
             GitProcess.Result forceCheckoutResult = git.ForceCheckout(branch);
+            if (forceCheckoutResult.HasErrors)
+            {
+                // It is possible to have the above TryDownloadCommit() fail because we
+                // already have the commit and root tree we intend to check out, but
+                // don't have a tree further down the working directory. If we fail
+                // checkout here, it may be due to not having these trees and the
+                // read-object hook is not available yet. Force downloading the commit
+                // again and retry the checkout.
+
+                if (!this.ForceTryDownloadCommit(
+                    refs.GetTipCommitId(branch),
+                    objectRequestor,
+                    gitObjects,
+                    out errorMessage))
+                {
+                    return new Result(errorMessage);
+                }
+
+                forceCheckoutResult = git.ForceCheckout(branch);
+            }
+
             if (forceCheckoutResult.HasErrors)
             {
                 string[] errorLines = forceCheckoutResult.Errors.Split('\n');

diff --git a/GVFS/GVFS/CommandLine/GVFSVerb.cs b/GVFS/GVFS/CommandLine/GVFSVerb.cs
@@ -405,11 +405,23 @@ protected bool TryDownloadCommit(
         {
             if (!repo.CommitAndRootTreeExists(commitId))
             {
-                if (!gitObjects.TryDownloadCommit(commitId))
-                {
-                    error = "Could not download commit " + commitId + " from: " + Uri.EscapeUriString(objectRequestor.CacheServer.ObjectsEndpointUrl);
-                    return false;
-                }
+                return this.ForceTryDownloadCommit(commitId, objectRequestor, gitObjects, out error);
+            }
+
+            error = null;
+            return true;
+        }
+
+        protected bool ForceTryDownloadCommit(
+            string commitId,
+            GitObjectsHttpRequestor objectRequestor,
+            GVFSGitObjects gitObjects,
+            out string error)
+        {
+            if (!gitObjects.TryDownloadCommit(commitId))
+            {
+                error = "Could not download commit " + commitId + " from: " + Uri.EscapeUriString(objectRequestor.CacheServer.ObjectsEndpointUrl);
+                return false;
             }
 
             error = null;