saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31301 from terminalmage/issue30999

Browse source 
Corrected fix for #30999
This commit is contained in:
Mike Place 2016-02-18 08:59:39 -07:00
commit f2b662371c
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
salt/states/git.py
View file

@ -986,8 +986,16 @@ def latest(name,
)
branch_opts = [set_upstream, desired_upstream]
elif upstream and desired_upstream is False:
upstream_action = 'Tracking branch was unset'
branch_opts = ['--unset-upstream']
# If the remote_rev is a tag or SHA1, and there is an
# upstream tracking branch, we will unset it. However, we
# can only do this if the git version is 1.8.0 or newer, as
# the --unset-upstream option was not added until that
# version.
if git_ver >= _LooseVersion('1.8.0'):
upstream_action = 'Tracking branch was unset'
branch_opts = ['--unset-upstream']
else:
branch_opts = None
elif desired_upstream and upstream != desired_upstream:
upstream_action = (
'Tracking branch was updated to {0}'.format(
@ -1412,8 +1420,16 @@ def latest(name,
)
branch_opts = [set_upstream, desired_upstream]
elif upstream and desired_upstream is False:
upstream_action = 'Tracking branch was unset'
branch_opts = ['--unset-upstream']
# If the remote_rev is a tag or SHA1, and there is an
# upstream tracking branch, we will unset it. However,
# we can only do this if the git version is 1.8.0 or
# newer, as the --unset-upstream option was not added
# until that version.
if git_ver >= _LooseVersion('1.8.0'):
upstream_action = 'Tracking branch was unset'
branch_opts = ['--unset-upstream']
else:
branch_opts = None
elif desired_upstream and upstream != desired_upstream:
upstream_action = (
'Tracking branch was updated to {0}'.format(