From 4f21bb5a407053dcf539ec8854bf3f29eb9e73eb Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sebastian@doubleopen.org>
Date: Wed, 31 Jan 2024 08:19:25 +0100
Subject: [PATCH] fix(git): Again use the Git CLI to perform the actual `reset`

JGit still does not support sparse checkouts [1], and its `reset` call
turns the sparse checkout done by `git checkout` into a full checkout.

So again use the Git CLI to perform the actual reset like done before
8472931, but continue to determine the resolved revision to reset to via
JGit.

Fixes #8195.

[1]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=383772

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
---
 plugins/version-control-systems/git/src/main/kotlin/Git.kt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/version-control-systems/git/src/main/kotlin/Git.kt b/plugins/version-control-systems/git/src/main/kotlin/Git.kt
index ec115cf243cd0..e6540618b7ce6 100644
--- a/plugins/version-control-systems/git/src/main/kotlin/Git.kt
+++ b/plugins/version-control-systems/git/src/main/kotlin/Git.kt
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.kotlin.logger
 
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.LsRemoteCommand
-import org.eclipse.jgit.api.ResetCommand
 import org.eclipse.jgit.api.errors.GitAPIException
 import org.eclipse.jgit.errors.UnsupportedCredentialItem
 import org.eclipse.jgit.lib.Constants
@@ -242,7 +241,7 @@ class Git : VersionControlSystem(), CommandLineTool {
             logger.warn { "Failed to fetch everything: ${it.collectMessages()}" }
         }.mapCatching { fetchResult ->
             // TODO: Migrate this to JGit once sparse checkout (https://bugs.eclipse.org/bugs/show_bug.cgi?id=383772) is
-            //       implemented.
+            //       implemented. Also see the "reset" call below.
             run("checkout", revision, workingDir = workingTree.workingDir)
 
             // In case of a non-fixed revision (branch or tag) reset the working tree to ensure that the previously
@@ -267,7 +266,7 @@ class Git : VersionControlSystem(), CommandLineTool {
                     "Requested revision '$revision' not found in refs advertised by the server."
                 }
 
-                git.reset().setMode(ResetCommand.ResetType.HARD).setRef(resolvedRevision).call()
+                run("reset", "--hard", resolvedRevision, workingDir = workingTree.workingDir)
             }
 
             revision