diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:29:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:29:11 -0700 |
| commit | eb4541569d4fdfb1cbdf503cfbf433e63d79b663 (patch) | |
| tree | 7622aa9f5abe57b4af530743a37ba057f23acdb4 /unpack-trees.h | |
| parent | Merge branch 'js/http-mb' (diff) | |
| parent | read-tree: move merge functions to the library (diff) | |
| download | git-eb4541569d4fdfb1cbdf503cfbf433e63d79b663.tar.gz git-eb4541569d4fdfb1cbdf503cfbf433e63d79b663.zip | |
Merge branch 'js/read-tree'
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h new file mode 100644 index 0000000000..c4601621cd --- /dev/null +++ b/unpack-trees.h @@ -0,0 +1,35 @@ +#ifndef UNPACK_TREES_H +#define UNPACK_TREES_H + +struct unpack_trees_options; + +typedef int (*merge_fn_t)(struct cache_entry **src, + struct unpack_trees_options *options); + +struct unpack_trees_options { + int reset; + int merge; + int update; + int index_only; + int nontrivial_merge; + int trivial_merges_only; + int verbose_update; + int aggressive; + const char *prefix; + merge_fn_t fn; + + int head_idx; + int merge_size; + + struct cache_entry *df_conflict_entry; +}; + +extern int unpack_trees(struct object_list *trees, + struct unpack_trees_options *options); + +int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o); +int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o); +int bind_merge(struct cache_entry **src, struct unpack_trees_options *o); +int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o); + +#endif |