| commit | ad17312e1170715a15651b3185dae9ebc6b6b8ef | |
| author | Stefan Beller <sbeller@google.com> | |
| Fri, 5 Jan 2018 20:03:03 +0000 (5 12:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jan 2018 20:35:35 +0000 (5 12:35 -0800) | ||
| tree | 572ede7e7432e4a9415282111df15f9f8711c93b | treesnapshot (tar.gz zip) |
| parent | 63d963a4706c6a085f6d790d7e589de3e9b369a4 | commitdiff |
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>
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 | diffblobblamehistory |