devtool: fix standalone clone conversion for nested git repos
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest5 patches 8 repliesIn review
- v35 patches 2 repliesSuperseded
- v23 patches 2 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 1 patch | 2 replies | Superseded |
Changes in v4 from the cover letter
- Fix regression from v3:
setup_git_repo() now detects nested repos both for fresh workspace repos and for recipes whose source is already a git repo (fixes test_devtool_modify_nested_gitsm).
Patches in v4 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | oe/patch: Skip commitIgnored when nothing is actually stagedmeta/ | +12 | 2 replies | |
| 2/5 | devtool: Register nested git repos before the initial commitscripts/ | +56 | 2 replies | |
| 3/5 | devtool-source: Make nested destsuffix git repos standalonemeta/ | +16 | 1 reply | |
| 4/5 | meta-selftest: Add devtool-test-multi-destsuffix recipemeta-selftest/ | +27 | 0 replies | |
| 5/5 | oeqa/selftest/devtool: Add test for multiple nested git destsuffix reposmeta/ | +64 | 2 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.
Cover letter [PATCH v4 0/5] devtool: fix standalone clone conversion for nested git repos
When a recipe has multiple git SRC_URI entries with destsuffix values nested inside S, devtool modify left all but the top-level repo with a .git/objects/info/alternates file pointing into the downloads cache.
Running 'bitbake -c cleanall' then removed those shared objects, breaking all subsequent git operations in the workspace.
Fix git_convert_standalone_clone() to walk all git repos nested inside S and repack each one to a fully standalone clone.
v1:
- Fix git_convert_standalone_clone() to walk all git repos nested inside S and repack each one to a standalone clone
v2:
- Add selftest recipe devtool-test-multi-destsuffix with six nested git SRC_URI entries to reproduce the scenario
- Add test_devtool_modify_multi_git_destsuffix_standalone to verify all nested repos have their alternates removed after devtool modify and remain usable after 'bitbake -c cleanall'
v3:
- Read SRC_URI directly instead of walking the tree for '.git' dirs - also fixes repos nested inside another repo's own working tree
- Fix setup_git_repo() to register nested repos as submodules before the initial commit (was dead code), processing bottom-up to avoid stale submodule references
- Fix commitIgnored() to skip committing when nothing is staged, so do_patch no longer fails on a submodule that's dirty only because of its own nested content
- Simplify test recipe to three genuinely-nested destsuffix entries (level1/level1/level2/level1/level2/level3), update selftest to match
v4:
- Fix regression from v3:
setup_git_repo() now detects nested repos both for fresh workspace repos and for recipes whose source is already a git repo (fixes test_devtool_modify_nested_gitsm).
Jamin Lin (5):
oe/patch: Skip commitIgnored when nothing is actually staged
devtool: Register nested git repos before the initial commit
devtool-source: Make nested destsuffix git repos standalone
meta-selftest: Add devtool-test-multi-destsuffix recipe oeqa/selftest/devtool: Add test for multiple nested git destsuffix
repos
.../devtool-test-multi-destsuffix_git.bb | 27 +++++++ meta/classes/devtool-source.bbclass | 16 ++++ meta/lib/oe/patch.py | 12 +++ meta/lib/oeqa/selftest/cases/devtool.py | 64 +++++++++++++++ scripts/lib/devtool/__init__.py | 79 +++++++++++++------ 5 files changed, 175 insertions(+), 23 deletions(-) create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multi-destsuffix_git.bb
Signature · 1 line
2.43.0