diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-07-10 07:44:53 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-07-10 07:44:53 +0200 |
| commit | d09b71d260c791816c7d6a73d6b7ab801f22865d (patch) | |
| tree | 673eda244852e3f8d88f1abff5d6955050cad398 /src/plugins/git | |
| parent | d20464d56f81d0524cb71b263c76e748832af0f8 (diff) | |
| parent | 3300182d405bffe062a0f2be900f35822a9e20b0 (diff) | |
| download | qt-creator-d09b71d260c791816c7d6a73d6b7ab801f22865d.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/android/androiddebugsupport.cpp
Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 08e1cdb88d..e2fa7fe8d5 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -795,7 +795,8 @@ QString GitClient::findGitDirForRepository(const QString &repositoryDir) const bool GitClient::managesFile(const QString &workingDirectory, const QString &fileName) const { - return vcsFullySynchronousExec(workingDirectory, {"ls-files", "--error-unmatch", fileName}).result + return vcsFullySynchronousExec(workingDirectory, {"ls-files", "--error-unmatch", fileName}, + Core::ShellCommand::NoOutput).result == SynchronousProcessResponse::Finished; } |