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

Resolve incompatability between depth and version

Browse source 
Git is unable to checkout the specified `version` when the repository is
cloned with a reduced history (`depth`).  However, if the repository is
already cloned, subsequent git module calls will update the repository
(default update=True), then properly checkout the specified `version`.
To allow the initial call to properly clone the specified `version`, at
the specified `depth`, this patch adds the `--branch` parameter when
cloning the repository.
This commit is contained in:
James Laska 2013-07-18 17:03:17 -04:00
parent bd9d3d4fdd
commit cf563c6838
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source_control/git
View file

@ -99,7 +99,7 @@ def get_version(git_path, dest):
sha = sha[0].split()[1] sha = sha[0].split()[1]
return sha return sha
def clone(git_path, module, repo, dest, remote, depth): def clone(git_path, module, repo, dest, remote, depth, version):
''' makes a new git repo if it does not already exist ''' ''' makes a new git repo if it does not already exist '''
dest_dirname = os.path.dirname(dest) dest_dirname = os.path.dirname(dest)
try: try:
@ -108,6 +108,8 @@ def clone(git_path, module, repo, dest, remote, depth):
pass pass
os.chdir(dest_dirname) os.chdir(dest_dirname)
cmd = [ git_path, 'clone', '-o', remote, '--recursive' ] cmd = [ git_path, 'clone', '-o', remote, '--recursive' ]
if version:
cmd.extend([ '--branch', str(version) ])
if depth: if depth:
cmd.extend([ '--depth', str(depth) ]) cmd.extend([ '--depth', str(depth) ])
cmd.extend([ repo, dest ]) cmd.extend([ repo, dest ])
@ -317,7 +319,7 @@ def main():
if not os.path.exists(gitconfig): if not os.path.exists(gitconfig):
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)
(rc, out, err) = clone(git_path, module, repo, dest, remote, depth) (rc, out, err) = clone(git_path, module, repo, dest, remote, depth, version)
elif not update: elif not update:
# Just return having found a repo already in the dest path # Just return having found a repo already in the dest path
# this does no checking that the repo is the actual repo # this does no checking that the repo is the actual repo