]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 63d963a) | patch
unpack-trees: oneway_merge to update submodules
authorStefan Beller <sbeller@google.com>
Fri, 5 Jan 2018 20:03:03 +0000 (12:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jan 2018 20:35:35 +0000 (12:35 -0800)
commitad17312e1170715a15651b3185dae9ebc6b6b8ef
tree572ede7e7432e4a9415282111df15f9f8711c93btree | snapshot
parent63d963a4706c6a085f6d790d7e589de3e9b369a4commit | diff
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>
unpack-trees.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.