From a80b1de5e4bb4be40cc7ae52e923be4ffe2990d9 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 19 Jun 2018 13:22:49 +0300 Subject: [PATCH] git: fix rebase progress detection Progress messages arrive on stderr. Relates to IDEA-194033. --- .../src/git4idea/rebase/GitRebaseLineListener.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java index ef729e27230c..3c11fa966ac7 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java @@ -15,7 +15,6 @@ */ package git4idea.rebase; -import com.intellij.execution.process.ProcessOutputTypes; import com.intellij.openapi.util.Key; import git4idea.commands.GitLineHandlerAdapter; @@ -31,10 +30,8 @@ public class GitRebaseLineListener extends GitLineHandlerAdapter { @Override public synchronized void onLineAvailable(String line, Key outputType) { - if (outputType == ProcessOutputTypes.STDOUT) { - if (PROGRESS.matcher(line).matches()) { - myProgressLine = line; - } + if (PROGRESS.matcher(line).matches()) { + myProgressLine = line; } }