admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: introduce {copy|clear}_merge_options()

Browse Source 
When mostly the same set of options are to be used to perform
multiple merges, one instance of the merge_options structure may
want to be created and used by copying from the same template
instance.  We saw such a use recently in "git merge-tree".

Let's make the pattern official by introducing copy_merge_options()
as a supported way to make a copy of the structure, and also give
clear_merge_options() to release any resources held by a copied
instance.  Currently we only make a shallow copy, so the former is a
mere structure assignment while the latter is a no-op, but this may
change in the future as the members of merge_options structure
evolve.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2023-10-11 13:37:47 -07:00
parent 6a4c9e7b32
commit b182658e3e
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
merge-recursive.c
View File

@@ -3912,6 +3912,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;