forked from qt-creator/qt-creator
Git: Do not append extraOptions twice in blame
Change-Id: I4e3bb13b597ee4a84848e70269d5618e0a41835a Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
04eb012267
commit
82903ba124
@@ -950,7 +950,6 @@ void GitClient::annotate(const QString &workingDir, const QString &file, const Q
|
|||||||
QStringList arguments(QLatin1String("blame"));
|
QStringList arguments(QLatin1String("blame"));
|
||||||
arguments << QLatin1String("--root");
|
arguments << QLatin1String("--root");
|
||||||
arguments.append(editor->configurationWidget()->arguments());
|
arguments.append(editor->configurationWidget()->arguments());
|
||||||
arguments.append(extraOptions);
|
|
||||||
arguments << QLatin1String("--") << file;
|
arguments << QLatin1String("--") << file;
|
||||||
if (!revision.isEmpty())
|
if (!revision.isEmpty())
|
||||||
arguments << revision;
|
arguments << revision;
|
||||||
|
|||||||
Reference in New Issue
Block a user