OSDN Git Service

unpack-trees: check if we can perform the operation for submodules
authorStefan Beller <sbeller@google.com>
Tue, 14 Mar 2017 21:46:39 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 21:07:16 +0000 (14:07 -0700)
commita7bc845a9ae2bc4c58566e6744dd3cec0f805244
tree4b9f61256b14ea2c7138548f3aad84c3e8fab8b4
parentd6b12300676c85175bb05088c79e4b975aed820c
unpack-trees: check if we can perform the operation for submodules

In a later patch we'll support submodule entries to be
in sync with the tree in working tree changing commands,
such as checkout or read-tree.

When a new submodule entry changes in the tree, we need to
check if there are conflicts (directory/file conflicts)
for the tree. Add this check for submodules to be
performed before the working tree is touched.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
unpack-trees.c
unpack-trees.h