feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Disallow Commit and Push if rebase is in progress

Browse Source 
Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-10-02 15:14:26 +03:00
committed by Orgad Shaneh
parent c07eaa2a25
commit 1f0cbbc807
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/gitclient.cpp
View File

@@ -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;
}