cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #638 from sfromm/issue604

Browse source 
Fix for issue 604
This commit is contained in:
Michael DeHaan 2012-07-20 10:49:15 -07:00
commit baf07659f7
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/git
View file

@ -148,10 +148,9 @@ def pull(repo, dest, branch):
else: else:
m = re.search( '^\s+%s$' % branch, gbranch_out, flags=re.M ) #see if we've already checked it out m = re.search( '^\s+%s$' % branch, gbranch_out, flags=re.M ) #see if we've already checked it out
if m is None: if m is None:
cmd = "git checkout -b %s origin/%s" % (branch, branch) cmd = "git checkout --track -b %s origin/%s" % (branch, branch)
else: else:
(out, err) = switchLocalBranch( branch )
cmd = "git pull -u origin" cmd = "git pull -u origin"
cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)