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

Merge pull request #3466 from robinro/git-full-clone-with-hash

Browse source 
git: fall back to full clone if version is hash
This commit is contained in:
Toshio Kuratomi 2016-04-19 07:42:06 -07:00
commit 98322a777f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source_control/git.py
View file

@ -321,14 +321,18 @@ def clone(git_path, module, repo, dest, remote, depth, version, bare,
except: except:
pass pass
cmd = [ git_path, 'clone' ] cmd = [ git_path, 'clone' ]
branch_or_tag = is_remote_branch(git_path, module, dest, repo, version) \
or is_remote_tag(git_path, module, dest, repo, version)
if bare: if bare:
cmd.append('--bare') cmd.append('--bare')
else: else:
cmd.extend([ '--origin', remote ]) cmd.extend([ '--origin', remote ])
if is_remote_branch(git_path, module, dest, repo, version) \ if branch_or_tag:
or is_remote_tag(git_path, module, dest, repo, version):
cmd.extend([ '--branch', version ]) cmd.extend([ '--branch', version ])
if depth: if depth and (branch_or_tag or version == 'HEAD' or refspec):
# only use depth if the remote opject is branch or tag (i.e. fetchable)
cmd.extend([ '--depth', str(depth) ]) cmd.extend([ '--depth', str(depth) ])
if reference: if reference:
cmd.extend([ '--reference', str(reference) ]) cmd.extend([ '--reference', str(reference) ])
@ -532,8 +536,9 @@ def fetch(git_path, module, repo, dest, version, remote, depth, bare, refspec):
fetch_cmd.extend(['--depth', str(depth)]) fetch_cmd.extend(['--depth', str(depth)])
fetch_cmd.extend([remote]) fetch_cmd.extend([remote])
if not depth: if not depth or not refspecs:
# don't try to be minimalistic but do a full clone # don't try to be minimalistic but do a full clone
# also do this if depth is given, but version is something that can't be fetched directly
if bare: if bare:
refspecs = ['+refs/heads/*:refs/heads/*', '+refs/tags/*:refs/tags/*'] refspecs = ['+refs/heads/*:refs/heads/*', '+refs/tags/*:refs/tags/*']
else: else: