From 6a40bdd2b83475becbf311b4e5e2228075842fa8 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 27 Sep 2016 19:52:07 +0300 Subject: [PATCH] Try to kill Git processes softly To avoid leaving index.lock file, and to lessen the possibility of repository corruption. IDEA-148376 --- .../git4idea/src/git4idea/commands/GitTextHandler.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/git4idea/src/git4idea/commands/GitTextHandler.java b/plugins/git4idea/src/git4idea/commands/GitTextHandler.java index ebed7e33d080..ed23c477097e 100644 --- a/plugins/git4idea/src/git4idea/commands/GitTextHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitTextHandler.java @@ -17,10 +17,7 @@ package git4idea.commands; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; -import com.intellij.execution.process.OSProcessHandler; -import com.intellij.execution.process.ProcessEvent; -import com.intellij.execution.process.ProcessHandler; -import com.intellij.execution.process.ProcessListener; +import com.intellij.execution.process.*; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -142,9 +139,9 @@ public abstract class GitTextHandler extends GitHandler { return new MyOSProcessHandler(commandLine); } - private static class MyOSProcessHandler extends OSProcessHandler { + private static class MyOSProcessHandler extends KillableColoredProcessHandler { private MyOSProcessHandler(@NotNull GeneralCommandLine commandLine) throws ExecutionException { - super(commandLine); + super(commandLine, true); } @NotNull @@ -159,5 +156,4 @@ public abstract class GitTextHandler extends GitHandler { return Registry.is("git.blocking.read") ? BaseOutputReader.Options.BLOCKING : BaseOutputReader.Options.NON_BLOCKING; } } - }