]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8788195) | patch
merge-{ort,recursive}: remove add_submodule_odb()
authorJonathan Tan <jonathantanmy@google.com>
Fri, 8 Oct 2021 21:08:17 +0000 (14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Oct 2021 22:06:06 +0000 (15:06 -0700)
commit155b517d5c8701f3b8bef78fe59d8fe33adbee96
tree73c5f0876086349e4bc518a6a938f68e65cfa9dctree | snapshot
parent8788195c8846be949e6cd4bd19c8dc5e6371ffd3commit | diff
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>
merge-ort.c diff | blob | blame | history
merge-recursive.c diff | blob | blame | history
strbuf.c diff | blob | blame | history
strbuf.h diff | blob | blame | history
t/t6437-submodule-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.