Release M283

.github/workflows/build.yaml

@@ -24,7 +24,7 @@ permissions:
   checks: read
 
 env:
-  GIT_VERSION: ${{ github.event.inputs.git_version || 'v2.55.0.vfs.0.10' }}
+  GIT_VERSION: ${{ github.event.inputs.git_version || 'v2.56.0.vfs.0.4' }}
 
 jobs:
   validate:
@@ -249,7 +249,7 @@ jobs:
 
     - name: Upload microsoft/git installers
       if: steps.check.outputs.result == ''
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: MicrosoftGit
         path: MicrosoftGit
@@ -308,21 +308,21 @@ jobs:
 
     - name: Upload functional tests drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: FunctionalTests_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: artifacts\GVFS.FunctionalTests
 
     - name: Upload FastFetch drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: FastFetch_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: artifacts\FastFetch
 
     - name: Upload GVFS installer
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: GVFS_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: artifacts\GVFS.Installers

.github/workflows/functional-tests.yaml

@@ -80,7 +80,7 @@ jobs:
       id: download-git
       if: steps.skip.outputs.result != 'true'
       continue-on-error: true
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: ${{ inputs.git_artifact_name }}
         path: git
@@ -90,7 +90,7 @@ jobs:
 
     - name: Download Git installer (retry)
       if: steps.skip.outputs.result != 'true' && steps.download-git.outcome == 'failure'
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: ${{ inputs.git_artifact_name }}
         path: git
@@ -102,7 +102,7 @@ jobs:
       id: download-gvfs
       if: steps.skip.outputs.result != 'true'
       continue-on-error: true
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: GVFS_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: gvfs
@@ -112,7 +112,7 @@ jobs:
 
     - name: Download GVFS installer (retry)
       if: steps.skip.outputs.result != 'true' && steps.download-gvfs.outcome == 'failure'
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: GVFS_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: gvfs
@@ -124,7 +124,7 @@ jobs:
       id: download-ft
       if: steps.skip.outputs.result != 'true'
       continue-on-error: true
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: FunctionalTests_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: ft
@@ -134,7 +134,7 @@ jobs:
 
     - name: Download functional tests drop (retry)
       if: steps.skip.outputs.result != 'true' && steps.download-ft.outcome == 'failure'
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: FunctionalTests_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: ft
@@ -145,7 +145,7 @@ jobs:
     - name: Download FastFetch drop
       if: steps.skip.outputs.result != 'true'
       continue-on-error: true
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: FastFetch_${{ matrix.configuration }}_${{ matrix.architecture }}
         path: ft
@@ -189,7 +189,7 @@ jobs:
 
     - name: Upload installation logs
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       continue-on-error: true
       with:
         name: ${{ env.ARTIFACT_PREFIX }}InstallationLogs_${{ env.FT_MATRIX_NAME }}
@@ -209,7 +209,7 @@ jobs:
 
     - name: Upload failure diagnostics (mount dumps + logs)
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       continue-on-error: true
       with:
         name: ${{ env.ARTIFACT_PREFIX }}FailureDiagnostics_${{ env.FT_MATRIX_NAME }}
@@ -218,14 +218,14 @@ jobs:
 
     - name: Upload functional test results
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: ${{ env.ARTIFACT_PREFIX }}FunctionalTests_Results_${{ env.FT_MATRIX_NAME }}
         path: TestResult.xml
 
     - name: Upload Git trace2 output
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
         name: ${{ env.ARTIFACT_PREFIX }}GitTrace2_${{ env.FT_MATRIX_NAME }}
         path: C:\temp\git-trace2.log

.github/workflows/upgrade-tests.yaml

@@ -66,14 +66,14 @@ jobs:
       id: download-git
       if: steps.skip.outputs.result != 'true'
       continue-on-error: true
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: MicrosoftGit
         path: git
 
     - name: Download Git installer (retry)
       if: steps.skip.outputs.result != 'true' && steps.download-git.outcome == 'failure'
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: MicrosoftGit
         path: git
@@ -82,14 +82,14 @@ jobs:
       id: download-gvfs
       if: steps.skip.outputs.result != 'true'
       continue-on-error: true
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: GVFS_${{ matrix.configuration }}_x64
         path: gvfs-new
 
     - name: Download current GVFS installer (retry)
       if: steps.skip.outputs.result != 'true' && steps.download-gvfs.outcome == 'failure'
-      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
         name: GVFS_${{ matrix.configuration }}_x64
         path: gvfs-new
@@ -387,7 +387,7 @@ jobs:
 
     - name: Upload service logs
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       continue-on-error: true
       with:
         name: UpgradeTest_Logs_${{ matrix.scenario }}

GVFS/FastFetch/CheckoutPrefetcher.cs

@@ -134,9 +134,9 @@ public override void Prefetch(string branchOrCommit, bool isBranch)
                             bool allowIndexMetadataUpdateFromWorkingTree = this.allowIndexMetadataUpdateFromWorkingTree || checkout.UpdatedWholeTree;
                             newIndex.UpdateFileSizesAndTimes(checkout.AddedOrEditedLocalFiles, allowIndexMetadataUpdateFromWorkingTree, shouldSignIndex, sourceIndex);
 
-                            // All the slow stuff is over, so we will now move the final index into .git\index, shortly followed by
+                            // All the slow stuff is over, so we will now move the final index into place, shortly followed by
                             // updating the ref files and releasing index.lock.
-                            string indexPath = Path.Combine(this.Enlistment.DotGitRoot, GVFSConstants.DotGit.IndexName);
+                            string indexPath = this.Enlistment.GitIndexPath;
                             this.Tracer.RelatedEvent(EventLevel.Informational, "MoveUpdatedIndexToFinalLocation", new EventMetadata() { { "UpdatedIndex", indexGen.TemporaryIndexFilePath }, { "Index", indexPath } });
                             File.Delete(indexPath);
                             File.Move(indexGen.TemporaryIndexFilePath, indexPath);
@@ -196,7 +196,7 @@ protected override void UpdateRefs(string branchOrCommit, bool isBranch, GitRefs
 
         private Index GetSourceIndex()
         {
-            string indexPath = Path.Combine(this.Enlistment.DotGitRoot, GVFSConstants.DotGit.IndexName);
+            string indexPath = this.Enlistment.GitIndexPath;
 
             if (File.Exists(indexPath))
             {

GVFS/GVFS.Common/DiskLayoutUpgrades/DiskLayoutUpgrade.cs

@@ -16,10 +16,12 @@ public abstract class DiskLayoutUpgrade
         protected abstract int SourceMinorVersion { get; }
         protected abstract bool IsMajorUpgrade { get; }
 
-        public static bool TryRunAllUpgrades(string enlistmentRoot)
+        public static bool TryRunAllUpgrades(string enlistmentRoot, out string error, out ReturnCode returnCode)
         {
             majorVersionUpgrades = new Dictionary<int, MajorUpgrade>();
             minorVersionUpgrades = new Dictionary<int, Dictionary<int, MinorUpgrade>>();
+            error = null;
+            returnCode = ReturnCode.Success;
 
             foreach (DiskLayoutUpgrade upgrade in GVFSPlatform.Instance.DiskLayoutUpgrade.Upgrades)
             {
@@ -31,7 +33,7 @@ public static bool TryRunAllUpgrades(string enlistmentRoot)
                 try
                 {
                     DiskLayoutUpgrade upgrade = null;
-                    while (TryFindUpgrade(tracer, enlistmentRoot, out upgrade))
+                    while (TryFindUpgrade(tracer, enlistmentRoot, out upgrade, out error, out returnCode))
                     {
                         if (upgrade == null)
                         {
@@ -40,11 +42,13 @@ public static bool TryRunAllUpgrades(string enlistmentRoot)
 
                         if (!upgrade.TryUpgrade(tracer, enlistmentRoot))
                         {
+                            returnCode = ReturnCode.GenericError;
                             return false;
                         }
 
                         if (!CheckLayoutVersionWasIncremented(tracer, enlistmentRoot, upgrade))
                         {
+                            returnCode = ReturnCode.GenericError;
                             return false;
                         }
                     }
@@ -55,6 +59,8 @@ public static bool TryRunAllUpgrades(string enlistmentRoot)
                 {
                     StartLogFile(enlistmentRoot, tracer);
                     tracer.RelatedError(e.ToString());
+                    error = e.Message;
+                    returnCode = ReturnCode.GenericError;
                     return false;
                 }
                 finally
@@ -64,17 +70,19 @@ public static bool TryRunAllUpgrades(string enlistmentRoot)
             }
         }
 
-        public static bool TryCheckDiskLayoutVersion(ITracer tracer, string enlistmentRoot, out string error)
+        public static bool TryCheckDiskLayoutVersion(ITracer tracer, string enlistmentRoot, out string error, out ReturnCode returnCode)
         {
             error = string.Empty;
+            returnCode = ReturnCode.Success;
             int majorVersion;
             int minorVersion;
             try
             {
-                if (TryGetDiskLayoutVersion(tracer, enlistmentRoot, out majorVersion, out minorVersion, out error))
+                if (TryGetDiskLayoutVersion(tracer, enlistmentRoot, out majorVersion, out minorVersion, out error, out returnCode))
                 {
                     if (majorVersion < GVFSPlatform.Instance.DiskLayoutUpgrade.Version.MinimumSupportedMajorVersion)
                     {
+                        returnCode = ReturnCode.GenericError;
                         error = string.Format(
                             "Breaking change to GVFS disk layout has been made since cloning. \r\nEnlistment disk layout version: {0} \r\nGVFS disk layout version: {1} \r\nMinimum supported version: {2}",
                             majorVersion,
@@ -85,6 +93,7 @@ public static bool TryCheckDiskLayoutVersion(ITracer tracer, string enlistmentRo
                     }
                     else if (majorVersion > GVFSPlatform.Instance.DiskLayoutUpgrade.Version.CurrentMajorVersion)
                     {
+                        returnCode = ReturnCode.GenericError;
                         error = string.Format(
                             "Changes to GVFS disk layout do not allow mounting after downgrade. Try mounting again using a more recent version of GVFS. \r\nEnlistment disk layout version: {0} \r\nGVFS disk layout version: {1}",
                             majorVersion,
@@ -94,6 +103,7 @@ public static bool TryCheckDiskLayoutVersion(ITracer tracer, string enlistmentRo
                     }
                     else if (majorVersion != GVFSPlatform.Instance.DiskLayoutUpgrade.Version.CurrentMajorVersion)
                     {
+                        returnCode = ReturnCode.GenericError;
                         error = string.Format(
                             "GVFS disk layout version doesn't match current version. Try running 'gvfs mount' to upgrade. \r\nEnlistment disk layout version: {0}.{1} \r\nGVFS disk layout version: {2}.{3}",
                             majorVersion,
@@ -112,7 +122,12 @@ public static bool TryCheckDiskLayoutVersion(ITracer tracer, string enlistmentRo
                 RepoMetadata.Shutdown();
             }
 
-            error = "Failed to read disk layout version. " + ConsoleHelper.GetGVFSLogMessage(enlistmentRoot);
+            if (returnCode != ReturnCode.MissingDiskLayoutVersion)
+            {
+                returnCode = ReturnCode.GenericError;
+                error = "Failed to read disk layout version. " + ConsoleHelper.GetGVFSLogMessage(enlistmentRoot);
+            }
+
             return false;
         }
 
@@ -256,13 +271,12 @@ private static bool CheckLayoutVersionWasIncremented(JsonTracer tracer, string e
             return true;
         }
 
-        private static bool TryFindUpgrade(JsonTracer tracer, string enlistmentRoot, out DiskLayoutUpgrade upgrade)
+        private static bool TryFindUpgrade(JsonTracer tracer, string enlistmentRoot, out DiskLayoutUpgrade upgrade, out string error, out ReturnCode returnCode)
         {
             int majorVersion;
             int minorVersion;
 
-            string error;
-            if (!TryGetDiskLayoutVersion(tracer, enlistmentRoot, out majorVersion, out minorVersion, out error))
+            if (!TryGetDiskLayoutVersion(tracer, enlistmentRoot, out majorVersion, out minorVersion, out error, out returnCode))
             {
                 StartLogFile(enlistmentRoot, tracer);
                 tracer.RelatedError(error);
@@ -300,6 +314,8 @@ private static bool TryFindUpgrade(JsonTracer tracer, string enlistmentRoot, out
 
             // return true to indicate that we succeeded, and no upgrader was found
             upgrade = null;
+            error = null;
+            returnCode = ReturnCode.Success;
             return true;
         }
 
@@ -309,9 +325,22 @@ private static bool TryGetDiskLayoutVersion(
             out int majorVersion,
             out int minorVersion,
             out string error)
+        {
+            ReturnCode returnCode;
+            return TryGetDiskLayoutVersion(tracer, enlistmentRoot, out majorVersion, out minorVersion, out error, out returnCode);
+        }
+
+        private static bool TryGetDiskLayoutVersion(
+            ITracer tracer,
+            string enlistmentRoot,
+            out int majorVersion,
+            out int minorVersion,
+            out string error,
+            out ReturnCode returnCode)
         {
             majorVersion = 0;
             minorVersion = 0;
+            returnCode = ReturnCode.GenericError;
 
             string dotGVFSPath = Path.Combine(enlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot);
 
@@ -323,13 +352,19 @@ private static bool TryGetDiskLayoutVersion(
                     return false;
                 }
 
-                if (!RepoMetadata.Instance.TryGetOnDiskLayoutVersion(out majorVersion, out minorVersion, out error))
+                if (!RepoMetadata.Instance.TryGetOnDiskLayoutVersion(out majorVersion, out minorVersion, out error, out returnCode))
                 {
+                    if (returnCode == ReturnCode.MissingDiskLayoutVersion)
+                    {
+                        error += " " + ConsoleHelper.GetGVFSLogMessage(enlistmentRoot);
+                    }
+
                     return false;
                 }
             }
 
             error = null;
+            returnCode = ReturnCode.Success;
             return true;
         }
 

GVFS/GVFS.Common/Enlistment.cs

@@ -62,6 +62,12 @@ protected Enlistment(
         public string WorkingDirectoryRoot { get; }
         public string WorkingDirectoryBackingRoot { get; }
 
+        /// <summary>
+        /// Path to the git directory that holds the repository metadata GVFS reads or writes
+        /// directly. The default is "&lt;WorkingDirectoryBackingRoot&gt;\.git", which is a file in a
+        /// linked worktree. Enlistments that support linked worktrees must set it to the
+        /// shared (common) git directory during construction.
+        /// </summary>
         public string DotGitRoot { get; protected set; }
         public abstract string GitObjectsRoot { get; protected set; }
         public abstract string LocalObjectsRoot { get; protected set; }