More add_submodule_odb() cleanup in merge code
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest3 patches 1 replyIn review
- v13 patches 5 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | submodule: remove unnecessary unabsorbed fallbacksubmodule.c | +2 | 0 replies | |
| 2/3 | repository: support unabsorbed in repo_submodule_initbuiltin/ builtin/ builtin/ +4 more | +28 | 0 replies | |
| 3/3 | revision: remove "submodule" from opt structmerge-ort.c merge-recursive.c revision.c +1 more | +72 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/3] More add_submodule_odb() cleanup in merge code
This is on jt/grep-wo-submodule-odb-as-alternate (unlike version 1) because that branch introduces another usage of repo_submodule_init(), and I need to update it.
The main change from version 1 is that I have introduced a patch (patch
2) that teaches repo_submodule_init() to support submodules with unabsorbed gitdirs, which means that I no longer need the original patch 1 that updated t6437 to absorb all git dirs.
Once again, all these patches work under GIT_TEST_MERGE_ALGORITHM=recursive and GIT_TEST_MERGE_ALGORITHM=ort (and when that envvar is unset, for good measure).
I have also tested it with the "DO NOT SUBMIT" patch 3 from version 1.
Jonathan Tan (3):
submodule: remove unnecessary unabsorbed fallback
repository: support unabsorbed in repo_submodule_init
revision: remove "submodule" from opt struct
builtin/grep.c | 5 +- builtin/ls-files.c | 4 +- builtin/submodule--helper.c | 7 +-- merge-ort.c | 53 +++++++++++++------- merge-recursive.c | 49 +++++++++++------- repository.c | 21 ++++---- repository.h | 15 +++--- revision.c | 16 ++---- revision.h | 1 - submodule.c | 24 ++------- t/helper/test-submodule-nested-repo-config.c | 4 +- 11 files changed, 102 insertions(+), 97 deletions(-)
Signature · 1 line
2.33.0.309.g3052b89438-goog