From 869f5d0a6cbc040065a3a3f816503df32cd65e7c Mon Sep 17 00:00:00 2001 From: Constantine Plotnikov Date: Tue, 6 Oct 2009 16:02:30 +0400 Subject: [PATCH] git4idea: IDEADEV-40642: In push active branches dialog added possiblity to push if there is no roots with errors --- .../src/git4idea/checkin/GitPushActiveBranchesDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java index a0dbbc696fea..e915cebcfa7f 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java @@ -69,7 +69,7 @@ public class GitPushActiveBranchesDialog extends DialogWrapper { setOKActionEnabled(false); break; } - if (r.remoteCommits != 0) { + if (r.remoteCommits != 0 && r.commits.size() != 0) { setErrorText(GitBundle.getString("push.active.error.behind")); setOKActionEnabled(false); break;