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

Fix typo in git refspec code. Change lists to tuples

Browse source
This commit is contained in:
Toshio Kuratomi 2014-12-22 12:11:49 -08:00
parent 2cbe13a21d
commit 8a03af6608
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source_control/git.py
View file

@ -474,7 +474,7 @@ def get_head_branch(git_path, module, dest, remote, bare=False):
def fetch(git_path, module, repo, dest, version, remote, bare, refspec): def fetch(git_path, module, repo, dest, version, remote, bare, refspec):
''' updates repo from remote sources ''' ''' updates repo from remote sources '''
commands = [["set a new url %s for %s" % (repo, remote)], [git_path, 'remote', 'set-url', remote, repo]] commands = [("set a new url %s for %s" % (repo, remote), [git_path, 'remote', 'set-url', remote, repo])]
fetch_str = 'download remote objects and refs' fetch_str = 'download remote objects and refs'
@ -482,14 +482,14 @@ def fetch(git_path, module, repo, dest, version, remote, bare, refspec):
refspecs = ['+refs/heads/*:refs/heads/*', '+refs/tags/*:refs/tags/*'] refspecs = ['+refs/heads/*:refs/heads/*', '+refs/tags/*:refs/tags/*']
if refspec: if refspec:
refspecs.append(refspec) refspecs.append(refspec)
commands.append([fetch_str, [git_path, 'fetch', remote] + refspecs]) commands.append((fetch_str, [git_path, 'fetch', remote] + refspecs))
else: else:
commands.append([fetch_str, [git_path, 'fetch', '--tags']]) commands.append((fetch_str, [git_path, 'fetch', '--tags']))
if refspec: if refspec:
# unlike in bare mode, there's no way to combine the # unlike in bare mode, there's no way to combine the
# additional refspec with the default git fetch behavior, # additional refspec with the default git fetch behavior,
# so use two commands # so use two commands
commands.append([fetch_str, [git_path, 'fetch', remote, refspec]]) commands.append((fetch_str, [git_path, 'fetch', remote, refspec]))
for (label,command) in commands: for (label,command) in commands:
(rc,out,err) = module.run_command(command, cwd=dest) (rc,out,err) = module.run_command(command, cwd=dest)