fix worktree mounts using primary enlistment's .gvfs paths

GVFS/FastFetch/CheckoutPrefetcher.cs

@@ -72,7 +72,7 @@ public override void Prefetch(string branchOrCommit, bool isBranch)
                 commitToFetch = branchOrCommit;
             }
 
-            using (new IndexLock(this.Enlistment.EnlistmentRoot, this.Tracer))
+            using (new IndexLock(this.Enlistment.PrimaryEnlistmentRoot, this.Tracer))
             {
                 this.DownloadMissingCommit(commitToFetch, this.GitObjects);
 
@@ -124,7 +124,7 @@ public override void Prefetch(string branchOrCommit, bool isBranch)
                         if (!indexGen.HasFailures)
                         {
                             Index newIndex = new Index(
-                                this.Enlistment.EnlistmentRoot,
+                                this.Enlistment.PrimaryEnlistmentRoot,
                                 this.Tracer,
                                 indexGen.TemporaryIndexFilePath,
                                 readOnly: false);
@@ -200,7 +200,7 @@ private Index GetSourceIndex()
 
             if (File.Exists(indexPath))
             {
-                Index output = new Index(this.Enlistment.EnlistmentRoot, this.Tracer, indexPath, readOnly: true);
+                Index output = new Index(this.Enlistment.PrimaryEnlistmentRoot, this.Tracer, indexPath, readOnly: true);
                 output.Parse();
                 return output;
             }

GVFS/FastFetch/FastFetchVerb.cs

@@ -240,7 +240,7 @@ private int ExecuteWithExitCode()
                 CacheServerInfo cacheServer = new CacheServerInfo(this.GetRemoteUrl(enlistment), null);
 
                 tracer.WriteStartEvent(
-                    enlistment.EnlistmentRoot,
+                    enlistment.PrimaryEnlistmentRoot,
                     enlistment.RepoUrl,
                     cacheServer.Url,
                     new EventMetadata

GVFS/FastFetch/GitEnlistment.cs

@@ -29,7 +29,7 @@ private GitEnlistment(string repoRoot, string gitBinPath)
 
         public string FastFetchLogRoot
         {
-            get { return Path.Combine(this.EnlistmentRoot, GVFSConstants.DotGit.Root, ".fastfetch"); }
+            get { return Path.Combine(this.PrimaryEnlistmentRoot, GVFSConstants.DotGit.Root, ".fastfetch"); }
         }
 
         public static GitEnlistment CreateFromCurrentDirectory(string gitBinPath)

GVFS/GVFS.Common/Database/GVFSDatabase.cs

@@ -21,10 +21,10 @@ public class GVFSDatabase : IGVFSConnectionPool, IDisposable
         private IDbConnectionFactory connectionFactory;
         private BlockingCollection<IDbConnection> connectionPool;
 
-        public GVFSDatabase(PhysicalFileSystem fileSystem, string enlistmentRoot, IDbConnectionFactory connectionFactory, int initialPooledConnections = InitialPooledConnections)
+        public GVFSDatabase(PhysicalFileSystem fileSystem, string dotGVFSRoot, IDbConnectionFactory connectionFactory, int initialPooledConnections = InitialPooledConnections)
         {
             this.connectionPool = new BlockingCollection<IDbConnection>();
-            this.databasePath = Path.Combine(enlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot, GVFSConstants.DotGVFS.Databases.VFSForGit);
+            this.databasePath = Path.Combine(dotGVFSRoot, GVFSConstants.DotGVFS.Databases.VFSForGit);
             this.connectionFactory = connectionFactory;
 
             string folderPath = Path.GetDirectoryName(this.databasePath);

GVFS/GVFS.Common/DiskLayoutUpgrades/DiskLayoutUpgrade_SqlitePlaceholders.cs

@@ -30,7 +30,7 @@ public override bool TryUpgrade(ITracer tracer, string enlistmentRoot)
                 }
 
                 using (placeholderList)
-                using (GVFSDatabase database = new GVFSDatabase(fileSystem, enlistmentRoot, new SqliteDatabase()))
+                using (GVFSDatabase database = new GVFSDatabase(fileSystem, Path.Combine(enlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot), new SqliteDatabase()))
                 {
                     PlaceholderTable placeholders = new PlaceholderTable(database);
                     List<IPlaceholderData> oldPlaceholderEntries = placeholderList.GetAllEntries();

GVFS/GVFS.Common/Enlistment.cs

@@ -21,7 +21,7 @@ protected Enlistment(
                 throw new ArgumentException("Path to git.exe must be set");
             }
 
-            this.EnlistmentRoot = enlistmentRoot;
+            this.PrimaryEnlistmentRoot = enlistmentRoot;
             this.WorkingDirectoryRoot = workingDirectoryRoot;
             this.WorkingDirectoryBackingRoot = workingDirectoryBackingRoot;
             this.DotGitRoot = Path.Combine(this.WorkingDirectoryBackingRoot, GVFSConstants.DotGit.Root);
@@ -52,7 +52,7 @@ protected Enlistment(
             this.Authentication = authentication ?? new GitAuthentication(gitProcess, this.RepoUrl);
         }
 
-        public string EnlistmentRoot { get; }
+        public string PrimaryEnlistmentRoot { get; }
 
         // Path to the root of the working (i.e. "src") directory.
         // On platforms where the contents of the working directory are stored

GVFS/GVFS.Common/FileSystem/HooksInstaller.cs

@@ -229,7 +229,7 @@ private static bool TryUpdateHook(
                     metadata.Add(nameof(installedHookPath), installedHookPath);
                     metadata.Add("Exception", e.ToString());
                     context.Tracer.RelatedError(metadata, "Failed to compare " + hookName + " version");
-                    errorMessage = "Error comparing " + hookName + " versions. " + ConsoleHelper.GetGVFSLogMessage(context.Enlistment.EnlistmentRoot);
+                    errorMessage = "Error comparing " + hookName + " versions. " + ConsoleHelper.GetGVFSLogMessage(context.Enlistment.WorkingDirectoryRoot);
                     return false;
                 }
             }
@@ -248,7 +248,7 @@ private static bool TryUpdateHook(
                     metadata.Add(nameof(installedHookPath), installedHookPath);
                     metadata.Add("Exception", e.ToString());
                     context.Tracer.RelatedError(metadata, "Failed to copy " + hookName + " to enlistment");
-                    errorMessage = "Error copying " + hookName + " to enlistment. " + ConsoleHelper.GetGVFSLogMessage(context.Enlistment.EnlistmentRoot);
+                    errorMessage = "Error copying " + hookName + " to enlistment. " + ConsoleHelper.GetGVFSLogMessage(context.Enlistment.WorkingDirectoryRoot);
                     return false;
                 }
             }

GVFS/GVFS.Common/GVFSEnlistment.cs

@@ -30,11 +30,11 @@ public GVFSEnlistment(string enlistmentRoot, string repoUrl, string gitBinPath,
                   flushFileBuffersForPacks: true,
                   authentication: authentication)
         {
-            this.NamedPipeName = GVFSPlatform.Instance.GetNamedPipeName(this.EnlistmentRoot);
-            this.DotGVFSRoot = Path.Combine(this.EnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot);
+            this.NamedPipeName = GVFSPlatform.Instance.GetNamedPipeName(this.PrimaryEnlistmentRoot);
+            this.DotGVFSRoot = Path.Combine(this.PrimaryEnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot);
             this.GitStatusCacheFolder = Path.Combine(this.DotGVFSRoot, GVFSConstants.DotGVFS.GitStatusCache.Name);
             this.GitStatusCachePath = Path.Combine(this.DotGVFSRoot, GVFSConstants.DotGVFS.GitStatusCache.CachePath);
-            this.GVFSLogsRoot = Path.Combine(this.EnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot, GVFSConstants.DotGVFS.LogName);
+            this.GVFSLogsRoot = Path.Combine(this.DotGVFSRoot, GVFSConstants.DotGVFS.LogName);
             this.LocalObjectsRoot = Path.Combine(this.WorkingDirectoryBackingRoot, GVFSConstants.DotGit.Objects.Root);
         }
 

GVFS/GVFS.Common/Git/GitRepo.cs

@@ -16,13 +16,19 @@
         private PhysicalFileSystem fileSystem;
         private LibGit2RepoInvoker libgit2RepoInvoker;
         private Enlistment enlistment;
+        private string dotGVFSRoot;
 
         public GitRepo(ITracer tracer, Enlistment enlistment, PhysicalFileSystem fileSystem, Func<LibGit2Repo> repoFactory = null)
         {
             this.tracer = tracer;
             this.enlistment = enlistment;
             this.fileSystem = fileSystem;
 
+            // Resolve the per-worktree .gvfs root if available; otherwise
+            // derive from EnlistmentRoot (primary enlistments).
+            this.dotGVFSRoot = (enlistment as GVFSEnlistment)?.DotGVFSRoot
+                ?? Path.Combine(enlistment.PrimaryEnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot);
+
             this.GVFSLock = new GVFSLock(tracer);
 
             this.libgit2RepoInvoker = new LibGit2RepoInvoker(
@@ -147,7 +153,7 @@
             size = 0;
 
             byte[] buffer = new byte[5];
             input.Read(buffer, 0, buffer.Length);
             if (!Enumerable.SequenceEqual(buffer, LooseBlobHeader))
             {
                 return false;
@@ -240,7 +246,7 @@
             {
                 if (corruptLooseObject)
                 {
-                    string corruptBlobsFolderPath = Path.Combine(this.enlistment.EnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot, GVFSConstants.DotGVFS.CorruptObjectsName);
+                    string corruptBlobsFolderPath = Path.Combine(this.dotGVFSRoot, GVFSConstants.DotGVFS.CorruptObjectsName);
                     string corruptBlobPath = Path.Combine(corruptBlobsFolderPath, Path.GetRandomFileName());
 
                     EventMetadata metadata = new EventMetadata();

GVFS/GVFS.Common/Git/RequiredGitConfig.cs

@@ -14,7 +14,7 @@ public static class RequiredGitConfig
         /// Returns the dictionary of required git config settings for a GVFS enlistment.
         /// These settings override any existing local configuration values.
         /// </summary>
-        public static Dictionary<string, string> GetRequiredSettings(Enlistment enlistment)
+        public static Dictionary<string, string> GetRequiredSettings(GVFSEnlistment enlistment)
         {
             string expectedHooksPath = Path.Combine(enlistment.DotGitRoot, GVFSConstants.DotGit.Hooks.RootName);
             expectedHooksPath = Paths.ConvertPathToGitFormat(expectedHooksPath);
@@ -31,8 +31,7 @@ public static Dictionary<string, string> GetRequiredSettings(Enlistment enlistme
             if (!GVFSEnlistment.IsUnattended(tracer: null) && GVFSPlatform.Instance.IsGitStatusCacheSupported())
             {
                 gitStatusCachePath = Path.Combine(
-                    enlistment.EnlistmentRoot,
-                    GVFSPlatform.Instance.Constants.DotGVFSRoot,
+                    enlistment.DotGVFSRoot,
                     GVFSConstants.DotGVFS.GitStatusCache.CachePath);
 
                 gitStatusCachePath = Paths.ConvertPathToGitFormat(gitStatusCachePath);

GVFS/GVFS.Common/HealthCalculator/EnlistmentPathData.cs

@@ -54,7 +54,7 @@ public void LoadPlaceholdersFromDatabase(GVFSEnlistment enlistment)
             List<IPlaceholderData> filePlaceholders = new List<IPlaceholderData>();
             List<IPlaceholderData> folderPlaceholders = new List<IPlaceholderData>();
 
-            using (GVFSDatabase database = new GVFSDatabase(new PhysicalFileSystem(), enlistment.EnlistmentRoot, new SqliteDatabase()))
+            using (GVFSDatabase database = new GVFSDatabase(new PhysicalFileSystem(), enlistment.DotGVFSRoot, new SqliteDatabase()))
             {
                 PlaceholderTable placeholderTable = new PlaceholderTable(database);
                 placeholderTable.GetAllEntries(out filePlaceholders, out folderPlaceholders);

GVFS/GVFS.Common/LocalCacheResolver.cs

@@ -33,7 +33,7 @@ public static bool TryGetDefaultLocalCacheRoot(GVFSEnlistment enlistment, out st
                 return true;
             }
 
-            return GVFSPlatform.Instance.TryGetDefaultLocalCacheRoot(enlistment.EnlistmentRoot, out localCacheRoot, out localCacheRootError);
+            return GVFSPlatform.Instance.TryGetDefaultLocalCacheRoot(enlistment.PrimaryEnlistmentRoot, out localCacheRoot, out localCacheRootError);
         }
 
         public bool TryGetLocalCacheKeyFromLocalConfigOrRemoteCacheServers(

GVFS/GVFS.Common/Maintenance/GitMaintenanceStep.cs

@@ -36,7 +36,7 @@ public static bool EnlistmentRootReady(GVFSContext context)
             // a "Device is not ready" error.
             try
             {
-                return context.FileSystem.DirectoryExists(context.Enlistment.EnlistmentRoot)
+                return context.FileSystem.DirectoryExists(context.Enlistment.WorkingDirectoryRoot)
                          && context.FileSystem.DirectoryExists(context.Enlistment.GitObjectsRoot);
             }
             catch (IOException)

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/WorktreeTests.cs

@@ -268,6 +268,82 @@ public void WorktreeOutsideEnlistmentTree()
             }
         }
 
+        [TestCase]
+        public void WorktreeUsesPerWorktreePlaceholderDatabase()
+        {
+            string suffix = Guid.NewGuid().ToString("N").Substring(0, 8);
+            string tempDir = Path.Combine(Path.GetTempPath(), $"gvfs-db-test-{suffix}");
+            string worktreePath = Path.Combine(tempDir, "wt");
+            string branchName = $"db-test-branch-{suffix}";
+
+            try
+            {
+                Directory.CreateDirectory(tempDir);
+
+                // 1. Create worktree outside the enlistment tree
+                ProcessResult addResult = GitHelpers.InvokeGitAgainstGVFSRepo(
+                    this.Enlistment.RepoRoot,
+                    $"worktree add -b {branchName} \"{worktreePath}\"");
+                addResult.ExitCode.ShouldEqual(0,
+                    $"worktree add failed: {addResult.Errors}");
+
+                // 2. Verify GVFS mount is running
+                this.AssertWorktreeMounted(worktreePath, "db-test worktree");
+
+                // 3. Resolve the per-worktree .gvfs path through the gitdir chain
+                GVFSEnlistment.WorktreeInfo wtInfo = GVFSEnlistment.TryGetWorktreeInfo(worktreePath);
+                Assert.IsNotNull(wtInfo, "Should be able to resolve worktree info");
+                string worktreeDotGVFS = Path.Combine(wtInfo.WorktreeGitDir, ".gvfs");
+                string worktreeDbPath = Path.Combine(worktreeDotGVFS, "databases", "VFSForGit.sqlite");
+
+                // 4. Materialize a file in the worktree by reading it
+                string testFilePath = Path.Combine(worktreePath, "Readme.md");
+                File.Exists(testFilePath).ShouldBeTrue("Readme.md should be projected");
+                File.ReadAllText(testFilePath);
+
+                // 5. Wait for background operations to flush placeholder entries
+                //    The primary mount handles background tasks; give it time to
+                //    process the worktree's placeholder creation.
+                System.Threading.Thread.Sleep(2000);
+
+                // 6. Verify the per-worktree placeholder DB has entries
+                File.Exists(worktreeDbPath).ShouldBeTrue(
+                    $"Per-worktree VFSForGit.sqlite should exist at {worktreeDbPath}");
+
+                string worktreePlaceholders = GVFSHelpers.GetAllSQLitePlaceholdersAsString(worktreeDbPath);
+                Assert.IsTrue(
+                    worktreePlaceholders.Contains("Readme.md"),
+                    $"Per-worktree placeholder DB should contain Readme.md entry.\n" +
+                    $"DB path: {worktreeDbPath}\n" +
+                    $"DB contents:\n{worktreePlaceholders}");
+
+                // 7. Verify the primary's placeholder DB does NOT contain a
+                //    duplicate entry from worktree materialization.  The primary
+                //    DB tracks the primary enlistment's placeholders only.
+                string primaryDbPath = Path.Combine(
+                    this.Enlistment.DotGVFSRoot, "databases", "VFSForGit.sqlite");
+                string primaryPlaceholders = GVFSHelpers.GetAllSQLitePlaceholdersAsString(primaryDbPath);
+
+                // Both DBs will have Readme.md since it exists in both worktrees,
+                // but the worktree DB must have its own non-empty set of entries
+                // (not be 0 bytes or an empty table).
+                long worktreeDbSize = new FileInfo(worktreeDbPath).Length;
+                Assert.Greater(worktreeDbSize, 0,
+                    "Per-worktree placeholder DB should not be 0 bytes");
+
+                // 8. Cleanup is handled in the finally block — worktree remove
+                //    can fail transiently due to handle release timing after unmount.
+            }
+            finally
+            {
+                this.ForceCleanupWorktree(worktreePath, branchName);
+                if (Directory.Exists(tempDir))
+                {
+                    try { Directory.Delete(tempDir, recursive: true); } catch { }
+                }
+            }
+        }
+
         private void InitWorktreeArrays(int count, out string[] paths, out string[] branches)
         {
             paths = new string[count];

GVFS/GVFS.Mount/InProcessMount.cs

@@ -211,7 +211,7 @@ private void MountWithLockAcquired(EventLevel verbosity, Keywords keywords)
                     this.FailMountAndExit("The .git folder is missing or has invalid contents");
                 }
 
-                if (!GVFSPlatform.Instance.FileSystem.IsFileSystemSupported(this.enlistment.EnlistmentRoot, out string fsError))
+                if (!GVFSPlatform.Instance.FileSystem.IsFileSystemSupported(this.enlistment.WorkingDirectoryRoot, out string fsError))
                 {
                     this.FailMountAndExit("FileSystem unsupported: " + fsError);
                 }
@@ -277,7 +277,7 @@ private void MountWithLockAcquired(EventLevel verbosity, Keywords keywords)
 
                 try
                 {
-                    Console.Title = "GVFS " + ProcessHelper.GetCurrentProcessVersion() + " - " + this.enlistment.EnlistmentRoot;
+                    Console.Title = "GVFS " + ProcessHelper.GetCurrentProcessVersion() + " - " + this.enlistment.WorkingDirectoryRoot;
                 }
                 catch (IOException)
                 {
@@ -365,7 +365,7 @@ private void InitializeWorktreeMetadata()
             // Use try/finally to guarantee Shutdown() even if an unexpected
             // exception occurs — the singleton must not be left pointing at
             // the primary's metadata directory.
-            string primaryDotGVFS = Path.Combine(this.enlistment.EnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot);
+            string primaryDotGVFS = Path.Combine(this.enlistment.PrimaryEnlistmentRoot, GVFSPlatform.Instance.Constants.DotGVFSRoot);
             string error;
             string gitObjectsRoot;
             string localCacheRoot;
@@ -996,7 +996,7 @@ private void HandlePostFetchJobRequest(NamedPipeMessages.Message message, NamedP
         private void HandleGetStatusRequest(NamedPipeServer.Connection connection)
         {
             NamedPipeMessages.GetStatus.Response response = new NamedPipeMessages.GetStatus.Response();
-            response.EnlistmentRoot = this.enlistment.EnlistmentRoot;
+            response.EnlistmentRoot = this.enlistment.WorkingDirectoryRoot;
             response.LocalCacheRoot = !string.IsNullOrWhiteSpace(this.enlistment.LocalCacheRoot) ? this.enlistment.LocalCacheRoot : this.enlistment.GitObjectsRoot;
             response.RepoUrl = this.enlistment.RepoUrl;
             response.CacheServer = this.cacheServer.ToString();
@@ -1082,7 +1082,7 @@ private void MountAndStartWorkingDirectoryCallbacks(CacheServerInfo cache, bool
                 this.tracer.RelatedInfo("Git status cache is not enabled");
             }
 
-            this.gvfsDatabase = this.CreateOrReportAndExit(() => new GVFSDatabase(this.context.FileSystem, this.context.Enlistment.EnlistmentRoot, new SqliteDatabase()), "Failed to create database connection");
+            this.gvfsDatabase = this.CreateOrReportAndExit(() => new GVFSDatabase(this.context.FileSystem, this.context.Enlistment.DotGVFSRoot, new SqliteDatabase()), "Failed to create database connection");
             this.fileSystemCallbacks = this.CreateOrReportAndExit(
                 () =>
                 {
@@ -1193,7 +1193,7 @@ private void ValidateFileSystemSupportsRequiredFeatures()
             {
                 string warning;
                 string error;
-                if (!GVFSPlatform.Instance.KernelDriver.IsSupported(this.enlistment.EnlistmentRoot, out warning, out error))
+                if (!GVFSPlatform.Instance.KernelDriver.IsSupported(this.enlistment.WorkingDirectoryRoot, out warning, out error))
                 {
                     this.FailMountAndExit("Error: {0}", error);
                 }