Commit 5fcfe97e authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Detect rebase even if rebase-apply does not contain "rebasing"

It might contains only autostash.

Change-Id: Ie95c63bde2314aac1b6d37f01301822e41df177c
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent c412e0bb
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment