diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 75a8f61d6f65167b362bc5c003bfb5cae6d6496c..e7f78e1b78e73485e40e0f744075677154fb35cc 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -254,7 +254,8 @@ void GerritPushDialog::setRemoteBranches(bool includeOld) void GerritPushDialog::updateCommits(int index) { const QString branch = m_ui->localBranchComboBox->itemText(index); - const bool hasLocalCommits = m_ui->commitView->init(m_workingDir, branch); + const bool hasLocalCommits = m_ui->commitView->init(m_workingDir, branch, + LogChangeWidget::Silent); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(hasLocalCommits); setChangeRange(); } diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index b955c81bb2c100f3a2a8431a11312d2063617251..f2360aee1e504d93a92c292fc4a223f53cdde6a7 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -78,12 +78,13 @@ bool LogChangeWidget::init(const QString &repository, const QString &commit, Log { if (!populateLog(repository, commit, flags)) return false; - if (!m_model->rowCount()) { + if (m_model->rowCount() > 0) + return true; + if (!(flags & Silent)) { VcsBaseOutputWindow::instance()->appendError( GitPlugin::instance()->gitClient()->msgNoCommits(flags & IncludeRemotes)); - return false; } - return true; + return false; } QString LogChangeWidget::commit() const diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h index fd91548fb7d9b13e6cfcbd34f14b033bbe9cf09c..c1fe042d0e184b97cd10ce80f5ce50c21dd7bb2e 100644 --- a/src/plugins/git/logchangedialog.h +++ b/src/plugins/git/logchangedialog.h @@ -56,7 +56,8 @@ public: enum LogFlag { None = 0x00, - IncludeRemotes = 0x01 + IncludeRemotes = 0x01, + Silent = 0x02 }; Q_DECLARE_FLAGS(LogFlags, LogFlag)