summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-11-28 16:27:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-05 11:42:32 +0900
commitd5498e087175ad7bbb0460a40cfb55cc3726226d (patch)
treed3daba2aa5d3f427a345c3a4386212bbd4668492 /builtin/merge-ours.c
parentsubmodule: store OIDs in changed_submodule_names (diff)
downloadtgif-d5498e087175ad7bbb0460a40cfb55cc3726226d.tar.xz
repository: repo_submodule_init to take a submodule struct
When constructing a struct repository for a submodule for some revision of the superproject where the submodule is not contained in the index, it may not be present in the working tree currently either. In that situation giving a 'path' argument is not useful. Upgrade the repo_submodule_init function to take a struct submodule instead. The submodule struct can be obtained via submodule_from_{path, name} or an artificial submodule struct can be passed in. While we are at it, rename the repository struct in the repo_submodule_init function, which is to be initialized, to a name that is not confused with the struct submodule as easily. Perform such renames in similar functions as well. Also move its documentation into the header file. Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions