diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-08-10 12:15:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-10 13:59:19 -0700 |
| commit | b48d5a050afa30402c8281c223df9d7e58b4493c (patch) | |
| tree | 43120ddc2fbdd17457ae285e5429417b22a70ea0 /unpack-trees.h | |
| parent | 79f5e0645ac7239bb0b019f2595bca18d469a280 (diff) | |
| download | git-b48d5a050afa30402c8281c223df9d7e58b4493c.tar.gz git-b48d5a050afa30402c8281c223df9d7e58b4493c.tar.xz | |
Move old index entry removal from "unpack_trees()" into the individual functions
This makes no changes to current code, but it allows the individual merge
functions to decide what to do about the old entry. They might decide to
update it in place, rather than force them to always delete and re-add it.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 9cd39a28a..5517faafa 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -4,7 +4,8 @@ struct unpack_trees_options; typedef int (*merge_fn_t)(struct cache_entry **src, - struct unpack_trees_options *options); + struct unpack_trees_options *options, + int remove); struct unpack_trees_options { int reset; @@ -29,9 +30,9 @@ struct unpack_trees_options { 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); -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); +int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o, int); +int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o, int); +int bind_merge(struct cache_entry **src, struct unpack_trees_options *o, int); +int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o, int); #endif |