summaryrefslogtreecommitdiff
path: root/t/diff-lib
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-01-05 12:03:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-05 12:35:35 -0800
commitad17312e1170715a15651b3185dae9ebc6b6b8ef (patch)
tree572ede7e7432e4a9415282111df15f9f8711c93b /t/diff-lib
parentt/lib-submodule-update.sh: fix test ignoring ignored files in submodules (diff)
downloadtgif-ad17312e1170715a15651b3185dae9ebc6b6b8ef.tar.xz
unpack-trees: oneway_merge to update submodules
When there is a one way merge, each submodule needs to be one way merged as well, if we're asked to recurse into submodules. In case of a submodule, check if it is up-to-date, otherwise set the flag CE_UPDATE, which will trigger an update of it in the phase updating the tree later. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/diff-lib')
0 files changed, 0 insertions, 0 deletions