diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ec31bb762dd..5e93d947a37 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -2171,6 +2171,12 @@
+
+
+
+
+
+
@@ -6416,6 +6422,12 @@
+
+
+
+
+
+
diff --git a/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts b/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
index 2c81f82f9aa..8f4921f2b75 100644
--- a/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
+++ b/libraries/tools/gradle/regression-benchmark-templates/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-scripting-common")
implementation("com.squareup.okhttp3:okhttp:4.9.0")
- implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
+ implementation("org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r")
implementation("org.slf4j:slf4j-nop:1.7.32")
implementation("org.jetbrains.kotlinx:dataframe:0.8.1")
}
diff --git a/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt b/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
index bf501414dee..280819b1dd6 100644
--- a/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
+++ b/libraries/tools/gradle/regression-benchmark-templates/src/main/kotlin/org/jetbrains/kotlin/gradle/benchmark/BenchmarkTemplate.kt
@@ -123,19 +123,25 @@ abstract class BenchmarkTemplate(
patch: InputStream
) {
println("Applying patch $patchName to repository")
- Git.open(projectRepoDir)
- .apply()
+ val git = Git.open(projectRepoDir)
+ git.apply()
.setPatch(patch)
.call()
+ git.close()
}
fun repoReset() {
println("Hard resetting project repo")
- Git.open(projectRepoDir)
- .reset()
+ val git = Git.open(projectRepoDir)
+ git.reset()
.setMode(ResetCommand.ResetType.HARD)
.setProgressMonitor(gitOperationsPrinter)
.call()
+ git.clean()
+ .setCleanDirectories(true)
+ .setForce(true)
+ .call()
+ git.close()
}
private fun runBenchmark(