-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
chore: remove submodule accidentally added to repo #15103
Conversation
Signed-off-by: Paul Brissaud <[email protected]>
@cyriltovena can this fix be backported to the 3.3.x release branch? 3.3.2 still has the ghost submodule reference which breaks submodule checkout:
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-15103-to-release-3.3.x origin/release-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 38fcef3f1a27305ad502927b9f7d4476b118488f When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-15103-to-release-3.3.x
# Create the PR body template
PR_BODY=$(gh pr view 15103 --json body --template 'Backport 38fcef3f1a27305ad502927b9f7d4476b118488f from #15103{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: remove submodule accidentally added to repo (backport release-3.3.x)' --body-file - --label 'size/XS' --label 'type/bug' --label 'backport' --base release-3.3.x --milestone release-3.3.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-15103-to-release-3.3.x
# Create a pull request where the `base` branch is `release-3.3.x` and the `compare`/`head` branch is `backport-15103-to-release-3.3.x`.
# Remove the local backport branch
git switch main
git branch -D backport-15103-to-release-3.3.x |
Signed-off-by: Paul Brissaud <[email protected]> Co-authored-by: Cyril Tovena <[email protected]> (cherry picked from commit 38fcef3)
Backport PR: #15775 |
What this PR does / why we need it:
Remove submodule file
Which issue(s) this PR fixes:
Fixes #15100
Special notes for your reviewer:
Checklist
CONTRIBUTING.md
guide (required)feat
PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.md
deprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR