summaryrefslogtreecommitdiff
path: root/t/t9154
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2021-09-09 11:47:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-09 14:09:30 -0700
commit10a0d6ae64ad4fec12ab2c1ed13d1791dde60371 (patch)
tree77babd696d3936864bdb6d5e4f1849926438a478 /t/t9154
parentrepository: support unabsorbed in repo_submodule_init (diff)
downloadtgif-10a0d6ae64ad4fec12ab2c1ed13d1791dde60371.tar.xz
revision: remove "submodule" from opt struct
Clean up a TODO in revision.h by removing the "submodule" field from struct setup_revision_opt. This field is only used to specify the ref store to use, so use rev_info->repo to determine the ref store instead. The only users of this field are merge-ort.c and merge-recursive.c. However, both these files specify the superproject as rev_info->repo and the submodule as setup_revision_opt->submodule. In order to be able to pass the submodule as rev_info->repo, all commits must be parsed with the submodule explicitly specified; this patch does that as well. (An incremental solution in which only some commits are parsed with explicit submodule will not work, because if the same commit is parsed twice in different repositories, there will be 2 heap-allocated object structs corresponding to that commit, and any flag set by the revision walking mechanism on one of them will not be reflected onto the other.) Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9154')
0 files changed, 0 insertions, 0 deletions