mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
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>
This commit is contained in:
parent
3c2a3fdc38
commit
7457014be5
|
@ -305,6 +305,22 @@ int xdiff_compare_lines(const char *l1, long s1,
|
||||||
return xdl_recmatch(l1, s1, l2, s2, flags);
|
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_style = -1;
|
||||||
|
|
||||||
int git_xmerge_config(const char *var, const char *value,
|
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 (!strcmp(var, "merge.conflictstyle")) {
|
||||||
if (!value)
|
if (!value)
|
||||||
return config_error_nonbool(var);
|
return config_error_nonbool(var);
|
||||||
if (!strcmp(value, "diff3"))
|
git_xmerge_style = parse_conflict_style_name(value);
|
||||||
git_xmerge_style = XDL_MERGE_DIFF3;
|
if (git_xmerge_style == -1)
|
||||||
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
|
|
||||||
return error(_("unknown style '%s' given for '%s'"),
|
return error(_("unknown style '%s' given for '%s'"),
|
||||||
value, var);
|
value, var);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -51,6 +51,7 @@ int buffer_is_binary(const char *ptr, unsigned long size);
|
||||||
void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
|
void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
|
||||||
void xdiff_clear_find_func(xdemitconf_t *xecfg);
|
void xdiff_clear_find_func(xdemitconf_t *xecfg);
|
||||||
struct config_context;
|
struct config_context;
|
||||||
|
int parse_conflict_style_name(const char *value);
|
||||||
int git_xmerge_config(const char *var, const char *value,
|
int git_xmerge_config(const char *var, const char *value,
|
||||||
const struct config_context *ctx, void *cb);
|
const struct config_context *ctx, void *cb);
|
||||||
extern int git_xmerge_style;
|
extern int git_xmerge_style;
|
||||||
|
|
Loading…
Reference in a new issue