diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-10-02 15:14:26 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-10-05 19:15:17 +0200 |
| commit | 1f0cbbc807e76078771a58c7dc20705dd48b8c72 (patch) | |
| tree | 9fe8963c595b89f1626d66dbb1c39d6cb9fe0f75 /src/plugins/git/gitclient.cpp | |
| parent | c07eaa2a252a9e108155c0f14219119e6f80505f (diff) | |
| download | qt-creator-1f0cbbc807e76078771a58c7dc20705dd48b8c72.tar.gz | |
Git: Disallow Commit and Push if rebase is in progress
Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
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; } |