saltstack/salt — pull request #7202 by pakdel (2013-09-12 20:25:40+00:00)
Title: Fixed Failed to load ext_pillar git: 'branch_name'

If there is something like the following in the master file:
```
ext_pillar:
- git: master file:///root/salt/pillar
- git: branch_name file:///root/salt/pillar
```
master branch will be checked out and assigned to pillar_roots:
`__opts__['pillar_roots']: {'base': ['/var/cache/salt/master/pillar_gitfs/0']}`

But when trying to get branch_name branch, it will fail:
```
[ERROR ] Failed to load ext_pillar git: 'branch_name'
Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/salt/pillar/__init__.py", line 410, in ext_pillar
ext = self.ext_pillars[key](self.opts['id'], pillar, val)
File "/usr/lib/python2.6/site-packages/salt/pillar/git_pillar.py", line 151, in ext_pillar
if __opts__['pillar_roots'][branch_env] == [repo.working_dir]:
KeyError: 'branch_name'
```