Skip to content

Commit 4c2201f

Browse files
committed
ResetMixedTests: drop test that behaves differently
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
1 parent 7037017 commit 4c2201f

1 file changed

Lines changed: 0 additions & 13 deletions

File tree

GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,6 @@ public void ResetMixedThenCheckoutWithConflicts()
7878
this.FilesShouldMatchCheckoutOfTargetBranch();
7979
}
8080

81-
[TestCase]
82-
public void ResetMixedOnlyAddedThenCheckoutWithConflicts()
83-
{
84-
this.ValidateGitCommand("checkout " + GitRepoTests.ConflictTargetBranch);
85-
this.ValidateGitCommand("reset --mixed HEAD~1");
86-
87-
// This will reset all the files except the files that were added
88-
// and are untracked to make sure we error out with those using sparse-checkout
89-
this.ValidateGitCommand("checkout -f");
90-
this.ValidateGitCommand("checkout " + GitRepoTests.ConflictSourceBranch);
91-
this.FilesShouldMatchCheckoutOfTargetBranch();
92-
}
93-
9481
[TestCase]
9582
public void ResetMixedAndCheckoutFile()
9683
{

0 commit comments

Comments
 (0)