diff options
| author | Stefan Beller <sbeller@google.com> | 2017-03-14 21:46:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-16 21:07:16 (GMT) |
| commit | a7bc845a9ae2bc4c58566e6744dd3cec0f805244 (patch) | |
| tree | 4b9f61256b14ea2c7138548f3aad84c3e8fab8b4 /unpack-trees.h | |
| parent | d6b12300676c85175bb05088c79e4b975aed820c (diff) | |
| download | git-a7bc845a9ae2bc4c58566e6744dd3cec0f805244.zip git-a7bc845a9ae2bc4c58566e6744dd3cec0f805244.tar.gz git-a7bc845a9ae2bc4c58566e6744dd3cec0f805244.tar.bz2 | |
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>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 36a73a6..6c48117b 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -21,6 +21,7 @@ enum unpack_trees_error_types { ERROR_SPARSE_NOT_UPTODATE_FILE, ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, ERROR_WOULD_LOSE_ORPHANED_REMOVED, + ERROR_WOULD_LOSE_SUBMODULE, NB_UNPACK_TREES_ERROR_TYPES }; |