Skip to content

update git submodules

Wesley Hayutin edited this page Jun 22, 2026 · 2 revisions

. First, clean up the submodule from the earlier cherry-pick branch:

cd restic git checkout oadp-1.6 git branch -D cve-2026-33186-oadp-1.6 cd .. 2. Fetch the latest from the restic remote and update the submodule to HEAD of oadp-1.6:

git submodule update --remote restic This reads the branch = oadp-1.6 setting from .gitmodules, fetches from openshift/restic, and checks out the latest commit on that branch.

  1. Verify the update:

git diff --submodule restic This shows the old and new commit the submodule points to.

  1. Commit and push:

git add restic git commit -m "Update restic submodule to fix CVE-2026-33186 Update restic submodule to latest HEAD of oadp-1.6 branch, picking up CVE fixes for google.golang.org/grpc." 5. Push to your fork and create a PR:

git push weshayutin HEAD:update-restic-submod-1.6 gh pr create --repo openshift/velero --base oadp-1.6
--title "Update restic submodule to fix CVE-2026-33186"
--body "Update restic submodule to latest HEAD of oadp-1.6 branch." Note: Right now the restic oadp-1.6 branch HEAD (8c4c3fbfe) is what the submodule already points to, so step 2 won't produce any changes yet. You'll need the CVE fix commits merged into the restic oadp-1.6 branch first (via a PR on openshift/restic) before --remote will pull in anything new.

Clone this wiki locally