New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

salt.utils.gitfs: Fix Dulwich env detection and submodule handling #30284

Merged
merged 1 commit into from Jan 12, 2016

Conversation

Projects
None yet
2 participants
@terminalmage
Member

terminalmage commented Jan 12, 2016

I broke this in dae738f. I mistakenly thought I saw both head refs and
remote refs in the fetch results, so by consolidating the code that
resolves refnames into environment names I ensured that the head refs
which were fetched would never be seen as fileserver environments.

This commit fixes #29684 by converting the names of the fetched head
refs to remote refs. Corresponding changes were also made to the
get_tree() function (as the refnames are now different).

Additionally, I discovered that Dulwich does not track information about
submodules, resulting in a KeyError when compiling a list of files. This
is the same issue that also affected Pygit2 and was fixed in 8c4ea64.
I've made a similar fix for it here.

salt.utils.gitfs: Fix Dulwich env detection and submodule handling
I broke this in dae738f. I mistakenly thought I saw both head refs and
remote refs in the fetch results, so by consolidating the code that
resolves refnames into environment names I ensured that the head refs
which were fetched would never be seen as fileserver environments.

This commit fixes #29684 by converting the names of the fetched head
refs to remote refs. Corresponding changes were also made to the
get_tree() function (as the refnames are now different).

Additionally, I discovered that Dulwich does not track information about
submodules, resulting in a KeyError when compiling a list of files. This
is the same issue that also affected Pygit2 and was fixed in 8c4ea64.
I've made a similar fix for it here.

cachedout added a commit that referenced this pull request Jan 12, 2016

Merge pull request #30284 from terminalmage/issue29684
salt.utils.gitfs: Fix Dulwich env detection and submodule handling

@cachedout cachedout merged commit 675ac4b into saltstack:2015.8 Jan 12, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11224 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8715 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12634 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12333 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment