From d84bd7fc933ced0c62e36b0e783a1976a3ed32ae Mon Sep 17 00:00:00 2001
From: Tyrie Vella <tyrielv@gmail.com>
Date: Thu, 14 Aug 2025 12:02:12 -0700
Subject: [PATCH] Functional test for cherry-pick -> restore corruption

Adds a test to reproduce corruption of cherry-pick followed by restore.
This should remove all staged changes in the index but leave the working
directory unchanged.
It still leaves the working directory unchanged, but the index is in a
corrupted state and git status no longer accurately reflects the
working directory.
---
 .../Tests/GitCommands/CorruptionReproTests.cs | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 GVFS/GVFS.FunctionalTests/Tests/GitCommands/CorruptionReproTests.cs

diff --git a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/CorruptionReproTests.cs b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/CorruptionReproTests.cs
new file mode 100644
index 000000000..412a3053d
--- /dev/null
+++ b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/CorruptionReproTests.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GVFS.Common;
+using GVFS.FunctionalTests.Properties;
+using GVFS.FunctionalTests.Tests.EnlistmentPerTestCase;
+using NUnit.Framework;
+
+namespace GVFS.FunctionalTests.Tests.GitCommands
+{
+    /// <summary>
+    /// This class is used to reproduce corruption scenarios in the GVFS virtual projection.
+    /// </summary>
+    [Category(Categories.GitCommands)]
+    [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
+    public class CorruptionReproTests : GitRepoTests
+    {
+        public CorruptionReproTests(Settings.ValidateWorkingTreeMode validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
+        {
+        }
+
+        [TestCase]
+        public void ReproCherryPickRestoreCorruption()
+        {
+            // Based on FunctionalTests/20170206_Conflict_Source
+            const string CherryPickCommit = "51d15f7584e81d59d44c1511ce17d7c493903390";
+            const string StartingCommit = "db95d631e379d366d26d899523f8136a77441914";            
+
+            this.ControlGitRepo.Fetch(StartingCommit);
+            this.ControlGitRepo.Fetch(CherryPickCommit);
+
+            this.ValidateGitCommand($"checkout -b FunctionalTests/CherryPickRestoreCorruptionRepro {StartingCommit}");
+
+            // Cherry-pick a variety of changes (adds, deletes, modifications) but don't commit.
+            // This will leave the repo in a state where the changes are staged (in the index).
+            this.ValidateGitCommand($"cherry-pick -n {CherryPickCommit}");
+
+            // Restore --staged should remove the changes from the index but leave them as-is (ie changed)
+            // in the working directory.
+            // As of VFSForGit 1.0.25169.1 and git 2.50.1.vfs.0.0, the working directory is as-is (still changed,
+            // as expected), but the index shows modified/deleted files as unchanged (ie completely reverted)
+            // and added files as still staged.
+            this.ValidateGitCommand("restore --staged .");
+            this.FilesShouldMatchCheckoutOfSourceBranch();
+        }
+    }
+}