From bab2021712fbfba217da844474a5f069b0265e09 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Sun, 24 Jun 2018 16:31:17 +0300
Subject: [PATCH] git: add test for commit via staging area

---
 .../tests/git4idea/tests/GitCommitTest.kt     |  4 ++--
 .../git4idea/tests/GitStagingCommitTest.kt    | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 plugins/git4idea/tests/git4idea/tests/GitStagingCommitTest.kt

diff --git a/plugins/git4idea/tests/git4idea/tests/GitCommitTest.kt b/plugins/git4idea/tests/git4idea/tests/GitCommitTest.kt
index 3a458d1fbfab..3f27b62fabb5 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitCommitTest.kt
+++ b/plugins/git4idea/tests/git4idea/tests/GitCommitTest.kt
@@ -35,7 +35,7 @@ import java.io.File
 import java.util.*
 
 
-class GitCommitTest : GitSingleRepoTest() {
+open class GitCommitTest : GitSingleRepoTest() {
   private val myMovementProvider = MyExplicitMovementProvider()
 
   override fun getDebugLogCategories() = super.getDebugLogCategories().plus("#" + GitCheckinEnvironment::class.java.name)
@@ -533,7 +533,7 @@ class GitCommitTest : GitSingleRepoTest() {
 
   fun `test commit rename with conflicting staged rename`() {
     `assume version where git reset returns 0 exit code on success `()
-    assumeTrue(Registry.`is`("git.force.commit.using.staging.area"))
+    assumeTrue(Registry.`is`("git.force.commit.using.staging.area")) // known bug in "--only" implementation
 
     tac("a.txt", "file content")
 
diff --git a/plugins/git4idea/tests/git4idea/tests/GitStagingCommitTest.kt b/plugins/git4idea/tests/git4idea/tests/GitStagingCommitTest.kt
new file mode 100644
index 000000000000..ece7fb2f43e1
--- /dev/null
+++ b/plugins/git4idea/tests/git4idea/tests/GitStagingCommitTest.kt
@@ -0,0 +1,20 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package git4idea.tests
+
+import com.intellij.openapi.util.registry.Registry
+
+class GitStagingCommitTest : GitCommitTest() {
+  override fun setUp() {
+    super.setUp()
+    Registry.get("git.force.commit.using.staging.area").setValue(true)
+  }
+
+  override fun tearDown() {
+    try {
+      Registry.get("git.force.commit.using.staging.area").resetToDefault()
+    }
+    finally {
+      super.tearDown()
+    }
+  }
+}
\ No newline at end of file