From edafba231d3b484a27fe1047d2bfa43422afa0af Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 1 Sep 2015 12:07:35 +0300 Subject: [PATCH] [git] Treat 'error:' as an error output line, since standard Git error messages end with colon --- plugins/git4idea/src/git4idea/commands/GitImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/commands/GitImpl.java b/plugins/git4idea/src/git4idea/commands/GitImpl.java index db3f45b77aa9..0f81ddafee72 100644 --- a/plugins/git4idea/src/git4idea/commands/GitImpl.java +++ b/plugins/git4idea/src/git4idea/commands/GitImpl.java @@ -682,7 +682,7 @@ public class GitImpl implements Git { // could be upper-cased, so should check case-insensitively public static final String[] ERROR_INDICATORS = { - "error", "remote: error", "fatal", + "error:", "remote: error", "fatal:", "Cannot", "Could not", "Interactive rebase already started", "refusing to pull", "cannot rebase:", "conflict", "unable" };