valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5152 from jasonrm/feature-git-force-checkout

Browse Source 
Adds force_checkout option to git state.
This commit is contained in:
Thomas S Hatch 2013-05-19 21:11:35 -07:00
commit fe87865581
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/states/git.py
View File

@ -36,6 +36,7 @@ def latest(name,
target=None,
runas=None,
force=None,
force_checkout=False,
submodules=False,
mirror=False,
bare=False,
@ -57,6 +58,9 @@ def latest(name,
Name of the user performing repository management operations
force
Force git to clone into pre-existing directories (deletes contents)
force_checkout
Force a checkout even if there might be overwritten changes
(Default: False)
submodules
Update submodules on clone or branch change (Default: False)
mirror
@ -139,7 +143,10 @@ def latest(name,
user=runas,
identity=identity)
__salt__['git.checkout'](target, rev, user=runas)
__salt__['git.checkout'](target,
rev,
force=force_checkout,
user=runas)
# check if we are on a branch to merge changes
cmd = "git symbolic-ref -q HEAD > /dev/null"