Disambiguation for files in git commands

With many git commands it is safer to disambiguate files from refs by
putting '--' in front of the list of files.

Also corrected a margin in the git submit panel.
This commit is contained in:
Thorbjørn Lindeijer
2008-12-03 13:21:50 +01:00
parent 6bc0da69af
commit b8ce2b1031
4 changed files with 18 additions and 15 deletions

View File

@@ -170,7 +170,7 @@ void GitClient::diff(const QString &workingDirectory, const QStringList &fileNam
if (Git::Constants::debug) if (Git::Constants::debug)
qDebug() << "diff" << workingDirectory << fileNames; qDebug() << "diff" << workingDirectory << fileNames;
QStringList arguments; QStringList arguments;
arguments << QLatin1String("diff") << fileNames; arguments << QLatin1String("diff") << QLatin1String("--") << fileNames;
const QString kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND); const QString kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND);
const QString title = tr("Git Diff"); const QString title = tr("Git Diff");
@@ -187,7 +187,7 @@ void GitClient::diff(const QString &workingDirectory, const QString &fileName)
QStringList arguments; QStringList arguments;
arguments << QLatin1String("diff"); arguments << QLatin1String("diff");
if (!fileName.isEmpty()) if (!fileName.isEmpty())
arguments << fileName; arguments << QLatin1String("--") << fileName;
const QString kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND); const QString kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND);
const QString title = tr("Git Diff %1").arg(fileName); const QString title = tr("Git Diff %1").arg(fileName);
@@ -246,7 +246,7 @@ void GitClient::blame(const QString &workingDirectory, const QString &fileName)
if (Git::Constants::debug) if (Git::Constants::debug)
qDebug() << "blame" << workingDirectory << fileName; qDebug() << "blame" << workingDirectory << fileName;
QStringList arguments(QLatin1String("blame")); QStringList arguments(QLatin1String("blame"));
arguments << fileName; arguments << QLatin1String("--") << fileName;
const QString kind = QLatin1String(Git::Constants::GIT_BLAME_EDITOR_KIND); const QString kind = QLatin1String(Git::Constants::GIT_BLAME_EDITOR_KIND);
const QString title = tr("Git Blame %1").arg(fileName); const QString title = tr("Git Blame %1").arg(fileName);
@@ -314,7 +314,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory,
QByteArray outputText; QByteArray outputText;
QByteArray errorText; QByteArray errorText;
QStringList arguments; QStringList arguments;
arguments << QLatin1String("reset") << QLatin1String("HEAD") << files; arguments << QLatin1String("reset") << QLatin1String("HEAD") << QLatin1String("--") << files;
const bool rc = synchronousGit(workingDirectory, arguments, &outputText, &errorText); const bool rc = synchronousGit(workingDirectory, arguments, &outputText, &errorText);
const QString output = QString::fromLocal8Bit(outputText); const QString output = QString::fromLocal8Bit(outputText);
m_plugin->m_outputWindow->popup(false); m_plugin->m_outputWindow->popup(false);
@@ -643,9 +643,9 @@ GitCommand::~GitCommand()
{ {
} }
void GitCommand::execute(const QStringList &arguments void GitCommand::execute(const QStringList &arguments,
, const QString &workingDirectory const QString &workingDirectory,
, const ProjectExplorer::Environment &environment) const ProjectExplorer::Environment &environment)
{ {
if (Git::Constants::debug) if (Git::Constants::debug)
qDebug() << "GitCommand::execute" << workingDirectory << arguments; qDebug() << "GitCommand::execute" << workingDirectory << arguments;
@@ -663,9 +663,9 @@ void GitCommand::execute(const QStringList &arguments
, Core::ProgressManagerInterface::CloseOnSuccess); , Core::ProgressManagerInterface::CloseOnSuccess);
} }
void GitCommand::run(const QStringList &arguments void GitCommand::run(const QStringList &arguments,
, const QString &workingDirectory const QString &workingDirectory,
, const ProjectExplorer::Environment &environment) const ProjectExplorer::Environment &environment)
{ {
if (Git::Constants::debug) if (Git::Constants::debug)
qDebug() << "GitCommand::run" << workingDirectory << arguments; qDebug() << "GitCommand::run" << workingDirectory << arguments;

View File

@@ -57,7 +57,7 @@ GitSubmitEditorPanelData GitSubmitEditorWidget::panelData() const
rc.author = m_gitSubmitPanelUi.authorLineEdit->text(); rc.author = m_gitSubmitPanelUi.authorLineEdit->text();
rc.email = m_gitSubmitPanelUi.emailLineEdit->text(); rc.email = m_gitSubmitPanelUi.emailLineEdit->text();
return rc; return rc;
}; }
void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data) void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
{ {

View File

@@ -11,6 +11,9 @@
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QGroupBox" name="infoGroup"> <widget class="QGroupBox" name="infoGroup">
<property name="title"> <property name="title">

View File

@@ -299,4 +299,4 @@ QIcon VCSBaseSubmitEditor::submitIcon()
return QIcon(QLatin1String(":/vcsbase/images/submit.png")); return QIcon(QLatin1String(":/vcsbase/images/submit.png"));
} }
} } // namespace VCSBase