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

Fix git_pillar edge case for remote repos without a master branch

Browse source 
When the remote repository does not have a master branch, on the initial
checkout there will be no ref in refs/remotes/origin for this branch,
leading to an error being logged and the checkout failing.

Instead of failing the checkout, in these cases we'll create the initial
local HEAD based on the ref we will eventually check out, since we know
for a fact that this ref exists.

Resolves #33725
This commit is contained in:
Erik Johnson 2016-06-02 13:24:36 -05:00
parent c8dc70b96a
commit d8ba7ed5a5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/utils/gitfs.py
View file

@ -1045,11 +1045,14 @@ class Pygit2(GitProvider):
return None
remote_head = 'refs/remotes/origin/' + branch_name
if remote_head not in refs:
log.error(
'Unable to find remote ref \'{0}\' in {1} remote '
'\'{2}\''.format(head_ref, self.role, self.id)
)
return None
# No remote ref for HEAD exists. This can happen in
# the first-time git_pillar checkout when when the
# remote repo does not have a master branch. Since
# we need a HEAD reference to keep pygit2 from
# throwing an error, and none exists in
# refs/remotes/origin, we'll just point HEAD at the
# remote_ref.
remote_head = remote_ref
self.repo.create_reference(
head_ref,
self.repo.lookup_reference(remote_head).target