From 5fcfe97e2370a4bb167e36c838f9fd8bc04730b9 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 17 Aug 2016 11:56:04 +0300 Subject: [PATCH] Git: Detect rebase even if rebase-apply does not contain "rebasing" It might contains only autostash. Change-Id: Ie95c63bde2314aac1b6d37f01301822e41df177c Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 91d58e775dd..d3a4cc116e4 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;