Resolve pre-commit hook causing conflicts

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
   - ?
 
 ### Fixed
-  - ?
+  - Pre-commit hook causing conflicts ([issue: #443](https://github.com/JLLeitschuh/ktlint-gradle/issues/443)) ([#502](https://github.com/JLLeitschuh/ktlint-gradle/pull/502))
 
 ### Removed
   - ?

plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/GitHook.kt

@@ -77,14 +77,22 @@ internal fun generateGitHook(
     echo "Running ktlint over these files:"
     echo "${'$'}CHANGED_FILES"
 
-    git stash push --keep-index
+    diff=.git/unstaged-ktlint-git-hook.diff
+    git diff --color=never > ${'$'}diff
+    if [ -s ${'$'}diff ]; then
+      git apply -R ${'$'}diff
+    fi
 
     ${generateGradleCommand(taskName, gradleRootDirPrefix)}
 
     echo "Completed ktlint run."
     ${postCheck(shouldUpdateCommit)}
 
-    git stash pop
+    if [ -s ${'$'}diff ]; then
+      git apply --ignore-whitespace ${'$'}diff
+    fi
+    rm ${'$'}diff
+    unset diff
 
     echo "Completed ktlint hook."
 

plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/GitHookTasksTest.kt

@@ -157,8 +157,10 @@ class GitHookTasksTest : AbstractPluginTest() {
         build(":$INSTALL_GIT_HOOK_FORMAT_TASK").run {
             assertThat(task(":$INSTALL_GIT_HOOK_FORMAT_TASK")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
             val hookText = gitDir.preCommitGitHook().readText()
-            assertThat(hookText).contains("git stash push")
-            assertThat(hookText).contains("git stash pop")
+            assertThat(hookText).contains("git diff --color=never > \$diff")
+            assertThat(hookText).contains("git apply -R \$diff")
+            assertThat(hookText).contains("git apply --ignore-whitespace \$diff")
+            assertThat(hookText).contains("rm \$diff")
         }
     }