forked from qt-creator/qt-creator
VCS[git]: Fix branch checkout: Use absolute path.
This commit is contained in:
@@ -146,16 +146,16 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
|
|||||||
args.clear();
|
args.clear();
|
||||||
args << QLatin1String("branch") << QLatin1String("--track")
|
args << QLatin1String("branch") << QLatin1String("--track")
|
||||||
<< checkoutBranch << (QLatin1String("origin/") + checkoutBranch);
|
<< checkoutBranch << (QLatin1String("origin/") + checkoutBranch);
|
||||||
job->addStep(binary, baseArgs + args, checkoutDir, env);
|
job->addStep(binary, baseArgs + args, *checkoutPath, env);
|
||||||
// Checkout branch
|
// Checkout branch
|
||||||
args.clear();
|
args.clear();
|
||||||
args << QLatin1String("checkout") << checkoutBranch;
|
args << QLatin1String("checkout") << checkoutBranch;
|
||||||
job->addStep(binary, baseArgs + args, checkoutDir, env);
|
job->addStep(binary, baseArgs + args, *checkoutPath, env);
|
||||||
// Delete master if desired
|
// Delete master if desired
|
||||||
if (deleteMasterBranch()) {
|
if (deleteMasterBranch()) {
|
||||||
args.clear();
|
args.clear();
|
||||||
args << QLatin1String("branch") << QLatin1String("-D") << masterBranch;
|
args << QLatin1String("branch") << QLatin1String("-D") << masterBranch;
|
||||||
job->addStep(binary, baseArgs + args, checkoutDir, env);
|
job->addStep(binary, baseArgs + args, *checkoutPath, env);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user