summaryrefslogtreecommitdiff
path: root/src/plugins/git/clonewizardpage.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2010-09-24 17:23:37 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2010-09-24 17:31:44 +0200
commit1613208c00408dd9592c8d5d630dbaaea5795e1a (patch)
tree05f692c1d8281cadd718f85205fc58e5de98bc10 /src/plugins/git/clonewizardpage.cpp
parent3f710c44980bf855956407501d42c7fdc3bd4338 (diff)
downloadqt-creator-1613208c00408dd9592c8d5d630dbaaea5795e1a.tar.gz
Git: Fix commiting with Author and Email set
Fix commiting with Author and Email set on Windows. Task-number: QTCREATOR-2397
Diffstat (limited to 'src/plugins/git/clonewizardpage.cpp')
-rw-r--r--src/plugins/git/clonewizardpage.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp
index 3d678210d0..504c60e283 100644
--- a/src/plugins/git/clonewizardpage.cpp
+++ b/src/plugins/git/clonewizardpage.cpp
@@ -126,9 +126,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
const QString checkoutDir = directory();
*checkoutPath = workingDirectory + QLatin1Char('/') + checkoutDir;
- QStringList baseArgs = client->binary();
- const QString binary = baseArgs.front();
- baseArgs.pop_front();
+ const QString binary = client->binary();
QStringList args;
args << QLatin1String("clone") << repository() << checkoutDir;
@@ -136,7 +134,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
VCSBase::ProcessCheckoutJob *job = new VCSBase::ProcessCheckoutJob;
const QProcessEnvironment env = client->processEnvironment();
// 1) Basic checkout step
- job->addStep(binary, baseArgs + args, workingDirectory, env);
+ job->addStep(binary, args, workingDirectory, env);
const QString checkoutBranch = branch();
// 2) Checkout branch, change to checkoutDir
@@ -146,16 +144,16 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
args.clear();
args << QLatin1String("branch") << QLatin1String("--track")
<< checkoutBranch << (QLatin1String("origin/") + checkoutBranch);
- job->addStep(binary, baseArgs + args, *checkoutPath, env);
+ job->addStep(binary, args, *checkoutPath, env);
// Checkout branch
args.clear();
args << QLatin1String("checkout") << checkoutBranch;
- job->addStep(binary, baseArgs + args, *checkoutPath, env);
+ job->addStep(binary, args, *checkoutPath, env);
// Delete master if desired
if (deleteMasterBranch()) {
args.clear();
args << QLatin1String("branch") << QLatin1String("-D") << masterBranch;
- job->addStep(binary, baseArgs + args, *checkoutPath, env);
+ job->addStep(binary, args, *checkoutPath, env);
}
}