The mergebasebranch option's base branch merge does not update submodules
Originally created by @anonym on #12556 (Redmine)
So branches will build and run the test suite with the Git submodule state as if the base branch merge didn’t happen, while Tails Git itself has the correct state.
Concrete example: feature/5630-deterministic-builds
has
feature/stretch
as base branch. On May 5th we updated the Chutney
submodule so Tor is not broken in the test suite. But when
feature/5630*
merges feature/stretch
(due to mergebasebranch
) it
won’t checkout the new Git submodule state, and that is why this branch
still fails all tests using Tor.
Feature Branch: bugfix/12556-mergebasebranch-update-submodules