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 #23986 from basepi/merge-forward-2015.5

Browse source 
[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Nicole Thomas 2015-05-20 12:41:33 -06:00
commit 9566e7d412
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/fileserver/gitfs.py
View file

@ -389,13 +389,12 @@ def _get_tree_gitpython(repo, tgt_env):
# Branch or tag not matched, check if 'tgt_env' is a commit
if not _env_is_exposed(tgt_env):
return None
try:
commit = repo['repo'].rev_parse(tgt_env)
except gitdb.exc.BadObject:
pass
else:
return commit.tree
return None
except gitdb.exc.ODBError:
return None
def _get_tree_pygit2(repo, tgt_env):