summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2021-10-08 14:08:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-08 15:06:06 -0700
commiteef71904ff68e90f2db37aa9e25fe82c3fccf2a0 (patch)
treeeece2d56814c5a970e2b7d7aa7389724c3e4677f /builtin/merge-tree.c
parentmerge-{ort,recursive}: remove add_submodule_odb() (diff)
downloadtgif-eef71904ff68e90f2db37aa9e25fe82c3fccf2a0.tar.xz
object-file: only register submodule ODB if needed
In a35e03dee0 ("submodule: lazily add submodule ODBs as alternates", 2021-09-08), Git was taught to add all known submodule ODBs as alternates when attempting to read an object that doesn't exist, as a fallback for when a submodule object is read as if it were in the_repository. However, this behavior wasn't restricted to happen only when reading from the_repository. Fix this. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions