builtin-am: implement --ignore-date

diff --git a/cache-tree.h b/cache-tree.h
index b47ccec7f626d7cda34ed17661c1dc3e4f035d6a..41c574663a14840aa726c46c19b071fa6555f0ef 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -39,12 +39,14 @@ int update_main_cache_tree(int);
 #define WRITE_TREE_IGNORE_CACHE_TREE 2
 #define WRITE_TREE_DRY_RUN 4
 #define WRITE_TREE_SILENT 8
+#define WRITE_TREE_REPAIR 16
 
 /* error return codes */
 #define WRITE_TREE_UNREADABLE_INDEX (-1)
 #define WRITE_TREE_UNMERGED_INDEX (-2)
 #define WRITE_TREE_PREFIX_ERROR (-3)
 
+int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
 int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
 void prime_cache_tree(struct index_state *, struct tree *);