Add flag to make unpack_trees() not print errors.

diff --git a/unpack-trees.h b/unpack-trees.h
index 5517faafad6ca3f327c81ab6e8e5f2701ff0ad14..83d12295325ba234458d140c5cc718ce5176ede9 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
        int trivial_merges_only;
        int verbose_update;
        int aggressive;
+       int gently;
        const char *prefix;
        int pos;
        struct dir_struct *dir;
@@ -25,6 +26,7 @@ struct unpack_trees_options {
        int merge_size;
 
        struct cache_entry *df_conflict_entry;
+       void *unpack_data;
 };
 
 extern int unpack_trees(unsigned n, struct tree_desc *t,