From 596e18db2c7e6056432f82acacd0d9805c407645 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Date: Mon, 30 Jan 2012 16:02:20 +0400
Subject: [PATCH] IDEA-79817 Better detection of rejected push; fix
 setStderrSuppressed in setSilent.

For branches with hyphens, for example.

[Reviewed by irengrig]
(cherry picked from commit 9d67aa2f6c29e260d8e44d94577c4cac691c83f0)
---
 plugins/git4idea/src/git4idea/commands/GitHandler.java        | 4 ++--
 .../git4idea/src/git4idea/push/GitPushRejectedDetector.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitHandler.java b/plugins/git4idea/src/git4idea/commands/GitHandler.java
index 79e0779f14d8..dd7ac999af35 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHandler.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHandler.java
@@ -502,8 +502,8 @@ public abstract class GitHandler {
   public void setSilent(final boolean silent) {
     checkNotStarted();
     mySilent = silent;
-    setStderrSuppressed(true);
-    setStdoutSuppressed(true);
+    setStderrSuppressed(silent);
+    setStdoutSuppressed(silent);
   }
 
   /**
diff --git a/plugins/git4idea/src/git4idea/push/GitPushRejectedDetector.java b/plugins/git4idea/src/git4idea/push/GitPushRejectedDetector.java
index 0dc47f2cdeb8..ca96475cfeec 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushRejectedDetector.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushRejectedDetector.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
  */
 class GitPushRejectedDetector implements GitLineHandlerListener {
 
-  private static final Pattern REJECTED_PATTERN = Pattern.compile("\\s+! \\[rejected\\]\\s+(\\w+) -> (\\w+) .*");
+  private static final Pattern REJECTED_PATTERN = Pattern.compile("\\s+! \\[rejected\\]\\s+(\\S+) -> (\\S+) .*");
   
   private final Collection<RejectedRef> myRejectedRefs = new ArrayList<RejectedRef>();