diff options
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r-- | src/plugins/git/gitclient.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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; } |