diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:04 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 10:08:52 -0700 |
| commit | 412aff7b3379b182e3331ec66c0657ae4e39d576 (patch) | |
| tree | 67056885c326766b7e4dadad774933c7ddcc629a /merge-ll.c | |
| parent | 7457014be5d095aac55cabd24c82bf0e42641f3b (diff) | |
| download | git-412aff7b3379b182e3331ec66c0657ae4e39d576.tar.gz | |
merge-ll: introduce LL_MERGE_OPTIONS_INIT
Introduce a macro to initialize `struct ll_merge_options` in preparation
for the next commit that will add a new member that needs to be
initialized to a non-zero value.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ll.c')
| -rw-r--r-- | merge-ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ll.c b/merge-ll.c index 5ffb045efb..ef200e4497 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -401,7 +401,7 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf, const struct ll_merge_options *opts) { struct attr_check *check = load_merge_attributes(); - static const struct ll_merge_options default_opts; + static const struct ll_merge_options default_opts = LL_MERGE_OPTIONS_INIT; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; const struct ll_merge_driver *driver; |