tree 572ede7e7432e4a9415282111df15f9f8711c93b
parent 63d963a4706c6a085f6d790d7e589de3e9b369a4
author Stefan Beller <sbeller@google.com> 1515182583 -0800
committer Junio C Hamano <gitster@pobox.com> 1515184535 -0800

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>