From 050d13726a4edfdcab9fb0f516beefc8bd685ba9 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 9 Jun 2013 20:59:15 +0300
Subject: [PATCH] Gerrit: Replace --remotes with -r for "git branch"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--remotes was added in 1.7.7
Change-Id: I691bfada8e0b4d2f00924caa76271ee256edf62c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gerrit/gerritpushdialog.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index 9dc42192dbd..87bc2d235d3 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -63,7 +63,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
QString output;
QString error;
QStringList args;
- args << QLatin1String("--remotes") << QLatin1String("--contains")
+ args << QLatin1String("-r") << QLatin1String("--contains")
<< earliestCommit + QLatin1Char('^');
if (!gitClient->synchronousBranchCmd(m_workingDir, args, &output, &error))
@@ -94,7 +94,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
error.clear();
args.clear();
- args << QLatin1String("--remotes");
+ args << QLatin1String("-r");
if (!gitClient->synchronousBranchCmd(m_workingDir, args, &output, &error))
return;
--
GitLab