diff options
| author |  Jonathan Tan <jonathantanmy@google.com> | 2021-10-08 14:08:17 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-10-08 15:06:06 -0700 |
| commit | 155b517d5c8701f3b8bef78fe59d8fe33adbee96 (patch) | |
| tree | 73c5f0876086349e4bc518a6a938f68e65cfa9dc /t/t6437-submodule-merge.sh | |
| parent | refs: peeling non-the_repository iterators is BUG (diff) | |
| download | tgif-155b517d5c8701f3b8bef78fe59d8fe33adbee96.tar.xz | |
merge-{ort,recursive}: remove add_submodule_odb()
After the parent commit and some of its ancestors, the only place
commits are being accessed through alternates is in the user-facing
message formatting code. Fix those, and remove the add_submodule_odb()
calls.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6437-submodule-merge.sh')
| -rwxr-xr-x | t/t6437-submodule-merge.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh index e5e89c2045..178413c22f 100755 --- a/t/t6437-submodule-merge.sh +++ b/t/t6437-submodule-merge.sh @@ -5,6 +5,9 @@ test_description='merging with submodules' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1 +export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB + . ./test-lib.sh . "$TEST_DIRECTORY"/lib-merge.sh |