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

merge-recursive: comment and reorder the merge_options fields

Browse Source 
The merge_options struct had lots of fields, making it a little
imposing, but the options naturally fall into multiple different groups.
Grouping similar options and adding a comment or two makes it easier to
read, easier for new folks to figure out which options are related, and
thus easier for them to find the options they need.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2019-08-17 11:41:39 -07:00
committed by Junio C Hamano
parent 8599ab4574
commit a779fb829b
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
merge-recursive.c
View File

@ -3754,21 +3754,27 @@ void init_merge_options(struct merge_options *opt,
{
const char *merge_verbosity;
memset(opt, 0, sizeof(struct merge_options));
opt->repo = repo;
opt->verbosity = 2;
opt->buffer_output = 1;
opt->rename_limit = -1;
opt->renormalize = 0;
opt->detect_renames = -1;
opt->detect_directory_renames = MERGE_DIRECTORY_RENAMES_CONFLICT;
opt->rename_limit = -1;
opt->verbosity = 2;
opt->buffer_output = 1;
strbuf_init(&opt->obuf, 0);
opt->renormalize = 0;
string_list_init(&opt->df_conflict_file_set, 1);
merge_recursive_config(opt);
merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
if (merge_verbosity)
opt->verbosity = strtol(merge_verbosity, NULL, 10);
if (opt->verbosity >= 5)
opt->buffer_output = 0;
strbuf_init(&opt->obuf, 0);
string_list_init(&opt->df_conflict_file_set, 1);
}
int parse_merge_opt(struct merge_options *opt, const char *s)