MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: fix rebase progress detection

Browse Source 
Progress messages arrive on stderr.
Relates to IDEA-194033.
This commit is contained in:
Kirill Likhodedov
2018-06-19 14:01:40 +03:00
parent 36ec7953b0
commit a80b1de5e4
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java
+2 -5
View File
@@ -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;
}
}