Fix omnibus submodule pointer to post-merge main HEAD#4181
Open
lbakerchef wants to merge 1 commit into
Open
Conversation
👷 Deploy Preview for chef-server processing.
|
The prior PR (#4175) was merged with the omnibus submodule pointing to the PRE-MERGE INSTRUCTIONS commit (024146f) rather than the actual omnibus-config main HEAD after the rebuild/CHEF-32135 PR merged. Advance submodule pointer to 939f4c9 (Merge pull request #5 from chef/rebuild/CHEF-32135-lbaker-20260430-092319). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
lbakerchef
force-pushed
the
fix/omnibus-submodule-pointer
branch
from
f2a209c to
7493478
Compare
|
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The prior PR #4175 was merged with the
omnibussubmodule still pointing to the>>> PRE-MERGE INSTRUCTIONS <<<commit (024146f) instead of the actual omnibus-config main HEAD after the rebuild/CHEF-32135 PR merged.Change
Advances the omnibus submodule pointer from:
024146f4f(>>> PRE-MERGE INSTRUCTIONS <<<) ❌To:
939f4c9e5(Merge pull request #5 from chef/rebuild/CHEF-32135-lbaker-20260430-092319) ✅Why
Anyone running
git submodule updateon chef-server main was getting the wrong omnibus-config commit. The.gitmodulescorrectly points tobranch = main, but the pinned SHA was left on the pre-merge marker commit.Testing
Single-file change (submodule gitlink only). No code changes.