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

Resolve target branch when using __env__

Browse source
This commit is contained in:
Pablo Suárez Hernández 2018-11-07 16:13:04 +00:00
parent d2fc910d59
commit 59894e2c83
No known key found for this signature in database
GPG key ID: A9683F02B512C911
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/gitfs.py
View file

@ -2980,7 +2980,7 @@ class GitPillar(GitBase):
if repo.env:
env = repo.env
else:
env = 'base' if repo.branch == repo.base else repo.branch
env = 'base' if repo.branch == repo.base else repo.get_checkout_target()
if repo._mountpoint:
if self.link_mountpoint(repo):
self.pillar_dirs[repo.linkdir] = env