From 80f2f646950d4a76caefb30e23755b7c21665adf Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 19 Dec 2014 17:39:11 +0100 Subject: [PATCH] [FIX] odoo.py fix fetching of git remotes remove the useless heads in local refs so that: git checkout -b master odoo/master and git checkout -b master-name odoo-dev/master-name works. --- odoo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/odoo.py b/odoo.py index 7208cb7eaf3..62de0586166 100755 --- a/odoo.py +++ b/odoo.py @@ -82,7 +82,7 @@ def cmd_setup_git(): run('git','config','remote.odoo.pushurl','git@github.com:odoo/odoo.git') run('git','config','--add','remote.odoo.fetch','dummy') run('git','config','--unset-all','remote.odoo.fetch') - run('git','config','--add','remote.odoo.fetch','+refs/heads/*:refs/remotes/odoo/heads/*') + run('git','config','--add','remote.odoo.fetch','+refs/heads/*:refs/remotes/odoo/*') # setup odoo-dev remote run('git','config','remote.odoo-dev.url','https://github.com/odoo-dev/odoo.git') run('git','config','remote.odoo-dev.pushurl','git@github.com:odoo-dev/odoo.git') @@ -100,7 +100,7 @@ def cmd_setup_git_dev(): # setup odoo-dev remote run('git','config','--add','remote.odoo-dev.fetch','dummy') run('git','config','--unset-all','remote.odoo-dev.fetch') - run('git','config','--add','remote.odoo-dev.fetch','+refs/heads/*:refs/remotes/odoo-dev/heads/*') + run('git','config','--add','remote.odoo-dev.fetch','+refs/heads/*:refs/remotes/odoo-dev/*') run('git','config','--add','remote.odoo-dev.fetch','+refs/pull/*:refs/remotes/odoo-dev/pull/*') run('git','remote','update') @@ -110,7 +110,7 @@ def cmd_setup_git_review(): # setup odoo-dev remote run('git','config','--add','remote.odoo.fetch','dummy') run('git','config','--unset-all','remote.odoo.fetch') - run('git','config','--add','remote.odoo.fetch','+refs/heads/*:refs/remotes/odoo/heads/*') + run('git','config','--add','remote.odoo.fetch','+refs/heads/*:refs/remotes/odoo/*') run('git','config','--add','remote.odoo.fetch','+refs/tags/*:refs/remotes/odoo/tags/*') run('git','config','--add','remote.odoo.fetch','+refs/pull/*:refs/remotes/odoo/pull/*')