feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Unbreak cloneing of non-default branches from local repos.

Browse Source 
Do not fail when cloning non-defautl branches from local repositories:
Branches do already exist in this case, so do not try to set them up
again.
This commit is contained in:
Tobias Hunger
2010-10-05 10:22:58 +02:00
parent cd6009c276
commit 6694994823
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/git/clonewizardpage.cpp
View File

@@ -41,6 +41,8 @@ namespace Git {
struct CloneWizardPagePrivate { struct CloneWizardPagePrivate {
CloneWizardPagePrivate(); CloneWizardPagePrivate();
bool urlIsLocal(const QString &url);
const QString mainLinePostfix; const QString mainLinePostfix;
const QString gitPostFix; const QString gitPostFix;
const QString protocolDelimiter; const QString protocolDelimiter;
@@ -56,6 +58,15 @@ CloneWizardPagePrivate::CloneWizardPagePrivate() :
{ {
} }
bool CloneWizardPagePrivate::urlIsLocal(const QString &url)
{
if (url.startsWith(QLatin1String("file://"))
|| url.startsWith(QLatin1Char('/'))
|| url.at(0).isLetter() && url.at(1) == QChar(':') && url.at(2) == QChar('\\'))
return true;
return false;
}
CloneWizardPage::CloneWizardPage(QWidget *parent) : CloneWizardPage::CloneWizardPage(QWidget *parent) :
VCSBase::BaseCheckoutWizardPage(parent), VCSBase::BaseCheckoutWizardPage(parent),
d(new CloneWizardPagePrivate) d(new CloneWizardPagePrivate)
@@ -144,10 +155,12 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
// 2) Checkout branch, change to checkoutDir // 2) Checkout branch, change to checkoutDir
if (!checkoutBranch.isEmpty() && checkoutBranch != d->headBranch) { if (!checkoutBranch.isEmpty() && checkoutBranch != d->headBranch) {
// Create branch // Create branch
if (!d->urlIsLocal(repository())) {
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, args, *checkoutPath, env); job->addStep(binary, args, *checkoutPath, env);
}
// Checkout branch // Checkout branch
args.clear(); args.clear();
args << QLatin1String("checkout") << checkoutBranch; args << QLatin1String("checkout") << checkoutBranch;