Merge pull request #1889 from tyrielv/tyrielv/fix-head-tree-id

tyrielv · web-flow · commit ef34a34ad106 · 2025-12-12T14:00:01.000-08:00
Fix GetHeadTreeId to only read head commit
diff --git a/GVFS/GVFS.Common/Git/GitProcess.cs b/GVFS/GVFS.Common/Git/GitProcess.cs
@@ -684,7 +684,7 @@ public Result MultiPackIndexRepack(string gitObjectDirectory, string batchSize)
 
         public Result GetHeadTreeId()
         {
-            return this.InvokeGitAgainstDotGitFolder("show -s --format=%T HEAD", usePreCommandHook: false);
+            return this.InvokeGitAgainstDotGitFolder("rev-parse \"HEAD^{tree}\"", usePreCommandHook: false);
         }
 
         public Process GetGitProcess(string command, string workingDirectory, string dotGitDirectory, bool useReadObjectHook, bool redirectStandardError, string gitObjectsDirectory, bool usePreCommandHook)
diff --git a/GVFS/GVFS.UnitTests/Common/EnlistmentHydrationSummaryTests.cs b/GVFS/GVFS.UnitTests/Common/EnlistmentHydrationSummaryTests.cs
@@ -100,7 +100,7 @@ public void HeadTreeCountCacheTests((string CachePrecontents, string ExpectedCac
                 this.enlistmentDirectory.CreateFile(totalPathCountPath, args.CachePrecontents, createDirectories: true);
             }
 
-            this.gitProcess.SetExpectedCommandResult("show -s --format=%T HEAD",
+            this.gitProcess.SetExpectedCommandResult("rev-parse \"HEAD^{tree}\"",
                 () => new GitProcess.Result(HeadTreeId, "", 0));
             this.gitProcess.SetExpectedCommandResult("ls-tree -r -d HEAD",
                 () => new GitProcess.Result(

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ public Result MultiPackIndexRepack(string gitObjectDirectory, string batchSize)`
`684`	`684`
`685`	`685`	`public Result GetHeadTreeId()`
`686`	`686`	`{`
`687`		`- return this.InvokeGitAgainstDotGitFolder("show -s --format=%T HEAD", usePreCommandHook: false);`
	`687`	`+ return this.InvokeGitAgainstDotGitFolder("rev-parse \"HEAD^{tree}\"", usePreCommandHook: false);`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`public Process GetGitProcess(string command, string workingDirectory, string dotGitDirectory, bool useReadObjectHook, bool redirectStandardError, string gitObjectsDirectory, bool usePreCommandHook)`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void HeadTreeCountCacheTests((string CachePrecontents, string ExpectedCac`
`100`	`100`	`this.enlistmentDirectory.CreateFile(totalPathCountPath, args.CachePrecontents, createDirectories: true);`
`101`	`101`	`}`
`102`	`102`
`103`		`- this.gitProcess.SetExpectedCommandResult("show -s --format=%T HEAD",`
	`103`	`+ this.gitProcess.SetExpectedCommandResult("rev-parse \"HEAD^{tree}\"",`
`104`	`104`	`() => new GitProcess.Result(HeadTreeId, "", 0));`
`105`	`105`	`this.gitProcess.SetExpectedCommandResult("ls-tree -r -d HEAD",`
`106`	`106`	`() => new GitProcess.Result(`