X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=50453ed20f755fea2e7138d7f01300b318f28dce;hb=3e08f5db65bcfe3ad238ee0de1cac2da84953cf3;hp=191f7442f10683c8043288eece36f39166fedc95;hpb=0220f1ebdee113e02031de0dba2d5e2c8623d6bb;p=git.git diff --git a/unpack-trees.h b/unpack-trees.h index 191f7442f..50453ed20 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -1,6 +1,8 @@ #ifndef UNPACK_TREES_H #define UNPACK_TREES_H +#define MAX_UNPACK_TREES 8 + struct unpack_trees_options; typedef int (*merge_fn_t)(struct cache_entry **src, @@ -15,7 +17,10 @@ struct unpack_trees_options { int trivial_merges_only; int verbose_update; int aggressive; + int skip_unmerged; + int gently; const char *prefix; + int pos; struct dir_struct *dir; merge_fn_t fn; @@ -23,9 +28,14 @@ struct unpack_trees_options { int merge_size; struct cache_entry *df_conflict_entry; + void *unpack_data; + + struct index_state *dst_index; + const struct index_state *src_index; + struct index_state result; }; -extern int unpack_trees(struct object_list *trees, +extern int unpack_trees(unsigned n, struct tree_desc *t, struct unpack_trees_options *options); int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);