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

fix(git): set --recurse-submodules flag for checkout #26163

Merged
merged 6 commits into from Dec 8, 2023

Conversation

mtardy
Copy link
Contributor

@mtardy mtardy commented Dec 6, 2023

Changes

Set --recurse-submodules when checking-out branches, so submodules are updated automatically when switching base branches.

Context

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

rarkins
rarkins previously approved these changes Dec 6, 2023
@rarkins rarkins requested a review from viceice December 6, 2023 11:54
lib/util/git/index.ts Outdated Show resolved Hide resolved
@mtardy
Copy link
Contributor Author

mtardy commented Dec 6, 2023

Sorry I rebased and force pushed out of habit!

viceice
viceice previously approved these changes Dec 6, 2023
@viceice
Copy link
Member

viceice commented Dec 6, 2023

this probably needs a new test case now

viceice
viceice previously approved these changes Dec 7, 2023
@mtardy
Copy link
Contributor Author

mtardy commented Dec 7, 2023

I think my new test has side effects on the others, can you help me @viceice ?

@mtardy mtardy force-pushed the pr/mtardy/fix-git-submodules branch from eef24b5 to c3e3412 Compare December 7, 2023 17:41
My global config was setting the main branch to the name "main" while
it's named "master" in the renovate CI, so this failed.
This allows to run setup and cleanup correctly on each tests and do not
pollute other tests outcome if they fail.
@mtardy
Copy link
Contributor Author

mtardy commented Dec 8, 2023

I think my test is good enough now 🤠

@viceice viceice added this pull request to the merge queue Dec 8, 2023
Merged via the queue into renovatebot:main with commit 74014fd Dec 8, 2023
36 checks passed
@mtardy mtardy deleted the pr/mtardy/fix-git-submodules branch December 8, 2023 17:07
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.89.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Renovate does not update git submodules when changing branch
4 participants