Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
timestamp_t: a new data type for timestamps
[gitweb.git]
/
unpack-trees.h
diff --git
a/unpack-trees.h
b/unpack-trees.h
index 36a73a6d003b6906dfb402aa930b352f5b368c60..6c48117b845fbf7b983852be302e4472c5e6d651 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
};