mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Get rid of error in legacy git pillar when using branch mapping notation
This doesn't fix the problem of the branch not being mapped to the specified branch, and this code is not going to be maintained going forward (in favor of the gitfs-backed git_pillar code), but this will at least prevent the branch from failing to checkout.
This commit is contained in:
parent
d513acb3e5
commit
28e07d5d06
1 changed files with 2 additions and 0 deletions
|
@ -316,6 +316,8 @@ class _LegacyGitPillar(object):
|
|||
branch = opts.get('environment') or 'base'
|
||||
if branch == 'base':
|
||||
branch = opts.get('gitfs_base') or 'master'
|
||||
elif ':' in branch:
|
||||
branch = branch.split(':', 1)[0]
|
||||
return branch
|
||||
|
||||
def update(self):
|
||||
|
|
Loading…
Add table
Reference in a new issue