From 1f0cbbc807e76078771a58c7dc20705dd48b8c72 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 2 Oct 2013 15:14:26 +0300
Subject: Git: Disallow Commit and Push if rebase is in progress

Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
---
 src/plugins/git/gitclient.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/plugins/git/gitclient.cpp')

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 0c3c245eb1..aa4e2b48db 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -3046,6 +3046,15 @@ bool GitClient::getCommitData(const QString &workingDirectory,
     }
 
     commitData.enablePush = !synchronousRemotesList(repoDirectory).isEmpty();
+    if (commitData.enablePush) {
+        switch (checkCommandInProgress(repoDirectory)) {
+        case GitClient::Rebase:
+        case GitClient::RebaseMerge:
+            commitData.enablePush = false;
+            break;
+        }
+    }
+
     return true;
 }
 
-- 
cgit v1.2.1