diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 17:08:52 (GMT) |
| commit | 7457014be5d095aac55cabd24c82bf0e42641f3b (patch) | |
| tree | 4568bd5e2631b22b93ecef1fa0e056f573728f20 /xdiff-interface.c | |
| parent | 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0 (diff) | |
| download | git-7457014be5d095aac55cabd24c82bf0e42641f3b.zip git-7457014be5d095aac55cabd24c82bf0e42641f3b.tar.gz git-7457014be5d095aac55cabd24c82bf0e42641f3b.tar.bz2 | |
xdiff-interface: refactor parsing of merge.conflictstyle
Factor out the code that parses of conflict style name so it can be
reused in a later commit that wants to parse the name given on the
command line.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 3162f51..16ed8ac 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -305,6 +305,22 @@ int xdiff_compare_lines(const char *l1, long s1, return xdl_recmatch(l1, s1, l2, s2, flags); } +int parse_conflict_style_name(const char *value) +{ + if (!strcmp(value, "diff3")) + return XDL_MERGE_DIFF3; + else if (!strcmp(value, "zdiff3")) + return XDL_MERGE_ZEALOUS_DIFF3; + else if (!strcmp(value, "merge")) + return 0; + /* + * Please update _git_checkout() in git-completion.bash when + * you add new merge config + */ + else + return -1; +} + int git_xmerge_style = -1; int git_xmerge_config(const char *var, const char *value, @@ -313,17 +329,8 @@ int git_xmerge_config(const char *var, const char *value, if (!strcmp(var, "merge.conflictstyle")) { if (!value) return config_error_nonbool(var); - if (!strcmp(value, "diff3")) - git_xmerge_style = XDL_MERGE_DIFF3; - else if (!strcmp(value, "zdiff3")) - git_xmerge_style = XDL_MERGE_ZEALOUS_DIFF3; - else if (!strcmp(value, "merge")) - git_xmerge_style = 0; - /* - * Please update _git_checkout() in - * git-completion.bash when you add new merge config - */ - else + git_xmerge_style = parse_conflict_style_name(value); + if (git_xmerge_style == -1) return error(_("unknown style '%s' given for '%s'"), value, var); return 0; |