diff options
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 0d7e57e2df..a0c3e7a2d9 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -6,10 +6,7 @@ #include "git-compat-util.h" #include "merge-recursive.h" -#include "advice.h" #include "alloc.h" -#include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h" @@ -32,8 +29,6 @@ #include "revision.h" #include "sparse-index.h" #include "string-list.h" -#include "submodule-config.h" -#include "submodule.h" #include "symlinks.h" #include "tag.h" #include "tree-walk.h" @@ -3912,6 +3907,22 @@ void init_merge_options(struct merge_options *opt, opt->buffer_output = 0; } +/* + * For now, members of merge_options do not need deep copying, but + * it may change in the future, in which case we would need to update + * this, and also make a matching change to clear_merge_options() to + * release the resources held by a copied instance. + */ +void copy_merge_options(struct merge_options *dst, struct merge_options *src) +{ + *dst = *src; +} + +void clear_merge_options(struct merge_options *opt UNUSED) +{ + ; /* no-op as our copy is shallow right now */ +} + int parse_merge_opt(struct merge_options *opt, const char *s) { const char *arg; |