Skip to content
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: switch submodule back to main branch #661

Merged
merged 1 commit into from
Aug 9, 2024

Conversation

willmurphyscode
Copy link
Contributor

@willmurphyscode willmurphyscode commented Aug 9, 2024

The branch it previously pointed at has been removed in the remote, which messes updating submodules from remote because git can't find the remote branch to update from.

It looks to me like #597 needed this until anchore/vulnerability-match-labels#136 was merged, but I don't think it needs it any more.

Manual testing:

Without change:

$ git clone --recurse-submodules [email protected]:anchore/vunnel
$ cd vunnel
$ git submodule update --remote --recursive
fatal: Unable to find refs/remotes/origin/ubuntu-label-updates revision in submodule path 'tests/quality/vulnerability-match-labels'

With change:

$ git clone --recurse-submodules [email protected]:anchore/vunnel -b chore-back-to-main-vulns
$ cd vunnel
$ git submodule update --remote --recursive # succeeds!

The branch it previously pointed at has been removed in the remote,
which messes up running remote updates of the submodule, since git
can no longer find a branch to update from.

Signed-off-by: Will Murphy <[email protected]>
@willmurphyscode willmurphyscode marked this pull request as ready for review August 9, 2024 12:06
@willmurphyscode willmurphyscode merged commit 0a4f214 into main Aug 9, 2024
15 checks passed
@willmurphyscode willmurphyscode deleted the chore-back-to-main-vulns branch August 9, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants