diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-08-17 11:56:04 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-08-18 11:55:30 +0000 |
| commit | 5fcfe97e2370a4bb167e36c838f9fd8bc04730b9 (patch) | |
| tree | e6c0830b6c978957288babb24d5afc767521ba5a /src | |
| parent | c412e0bb2ad86576f345c3d39dc195acfbb08c20 (diff) | |
| download | qt-creator-5fcfe97e2370a4bb167e36c838f9fd8bc04730b9.tar.gz | |
Git: Detect rebase even if rebase-apply does not contain "rebasing"
It might contains only autostash.
Change-Id: Ie95c63bde2314aac1b6d37f01301822e41df177c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 91d58e775d..d3a4cc116e 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1966,7 +1966,7 @@ GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &wo const QString gitDir = findGitDirForRepository(workingDirectory); if (QFile::exists(gitDir + "/MERGE_HEAD")) return Merge; - else if (QFile::exists(gitDir + "/rebase-apply/rebasing")) + else if (QFile::exists(gitDir + "/rebase-apply")) return Rebase; else if (QFile::exists(gitDir + "/rebase-merge")) return RebaseMerge; |