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

IDEA-79817 Better detection of rejected push; fix setStderrSuppressed in setSilent.

Browse Source 
For branches with hyphens, for example.

[Reviewed by irengrig]
(cherry picked from commit 9d67aa2f6c29e260d8e44d94577c4cac691c83f0)
This commit is contained in:
Kirill Likhodedov
2012-01-30 16:12:27 +04:00
committed by Kirill Likhodedov
parent 5ffb62f017
commit 596e18db2c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitHandler.java
+2 -2
View File
@@ -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);
}
/**
plugins/git4idea/src/git4idea/push/GitPushRejectedDetector.java
+1 -1
View File
@@ -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>();