/
uis
/
git
/
x
/
uis
/
git
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
unpack-trees: check if we can perform the operation for submodules
[git/git.git]
/
unpack-trees.h
diff --git
a/unpack-trees.h
b/unpack-trees.h
index
36a73a6
..
6c48117
100644
(file)
--- 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
};