diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
| commit | 0619de868110586e8a6561ecbc1d62c80da09501 (patch) | |
| tree | 1a4364a3660f57d5f10ac5a7471d30e3f555c5f4 /src/plugins/git | |
| parent | 44886ad65a2226511a6b9a4383189e4ab804e47f (diff) | |
| parent | 26f6cbf8b59dffa7f47b315031b7055ec3421315 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/tools/clangpchmanagerbackend/source/taskscheduler.h
Change-Id: I518adaf647df412887c2a372416634359f09ad2a
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 9fdd6a2790..8dac609897 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2524,7 +2524,8 @@ bool GitClient::getCommitData(const QString &workingDirectory, // Run status. Note that it has exitcode 1 if there are no added files. QString output; if (commitData.commitType == FixupCommit) { - synchronousLog(repoDirectory, {HEAD, "--not", "--remotes", "-n1"}, &output, errorMessage); + synchronousLog(repoDirectory, {HEAD, "--not", "--remotes", "-n1"}, &output, errorMessage, + VcsCommand::SuppressCommandLogging); if (output.isEmpty()) { *errorMessage = msgNoCommits(false); return false; |