diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h index a7a5fad38e7343455b194e34a38b0b5c264efae8..59fbf665ad8a9d2518c4f22e6ab8eb775ee26670 100644 --- a/src/plugins/git/changeselectiondialog.h +++ b/src/plugins/git/changeselectiondialog.h @@ -75,18 +75,18 @@ private slots: private: void enableButtons(bool b); - QProcess* m_process; + QProcess *m_process; QString m_gitBinaryPath; QProcessEnvironment m_gitEnvironment; - QLabel* m_workingDirectoryLabel; - QLineEdit* m_changeNumberEdit; - QPlainTextEdit* m_detailsText; - QPushButton* m_showButton; - QPushButton* m_cherryPickButton; - QPushButton* m_revertButton; - QPushButton* m_checkoutButton; - QPushButton* m_cancelButton; + QLabel *m_workingDirectoryLabel; + QLineEdit *m_changeNumberEdit; + QPlainTextEdit *m_detailsText; + QPushButton *m_showButton; + QPushButton *m_cherryPickButton; + QPushButton *m_revertButton; + QPushButton *m_checkoutButton; + QPushButton *m_cancelButton; ChangeCommand m_command; }; diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 2337781d64fd8140c4131eb16b74d460467b12ea..a86da546c95d16f8f54ea707c62c8eaf264bddb4 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -473,6 +473,7 @@ void GerritPlugin::fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &c && QFile::exists(m_dialog->repositoryPath())) { repository = gitClient->findRepositoryForDirectory(m_dialog->repositoryPath()); } + if (!repository.isEmpty()) { // Check if remote from a working dir is the same as remote from patch QMap<QString, QString> remotesList = gitClient->synchronousRemotesList(repository); @@ -505,7 +506,7 @@ void GerritPlugin::fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &c } } - if (!verifiedRepository){ + if (!verifiedRepository) { QMessageBox::StandardButton answer = QMessageBox::question( Core::ICore::mainWindow(), tr("Remote not Verified"), tr("Change host: %1\nand project: %2\n\nwere not verified among remotes" diff --git a/src/plugins/git/gerrit/gerritplugin.h b/src/plugins/git/gerrit/gerritplugin.h index 98478a8b25f42aa37a983a25f58f7f5f0891a5b7..56e50145d29e1c7a124ae041c179b0ba8b68283b 100644 --- a/src/plugins/git/gerrit/gerritplugin.h +++ b/src/plugins/git/gerrit/gerritplugin.h @@ -44,9 +44,7 @@ class ActionContainer; class Command; } -namespace Locator { - class CommandLocator; -} +namespace Locator { class CommandLocator; } namespace Gerrit { namespace Internal { @@ -55,7 +53,7 @@ class GerritChange; class GerritParameters; class GerritDialog; -typedef QPair<QAction *, Core::Command* > ActionCommandPair; +typedef QPair<QAction *, Core::Command *> ActionCommandPair; class GerritPlugin : public QObject {