[thirdparty/git.git] / xdiff-interface.c

#include "git-compat-util.h"
#include "gettext.h"
#include "config.h"
#include "hex.h"
#include "object-store-ll.h"
#include "strbuf.h"
#include "xdiff-interface.h"
#include "xdiff/xtypes.h"
#include "xdiff/xdiffi.h"
#include "xdiff/xutils.h"

struct xdiff_emit_state {
	xdiff_emit_hunk_fn hunk_fn;
	xdiff_emit_line_fn line_fn;
	void *consume_callback_data;
	struct strbuf remainder;
};

static int xdiff_out_hunk(void *priv_,
			  long old_begin, long old_nr,
			  long new_begin, long new_nr,
			  const char *func, long funclen)
{
	struct xdiff_emit_state *priv = priv_;

	if (priv->remainder.len)
		BUG("xdiff emitted hunk in the middle of a line");

	priv->hunk_fn(priv->consume_callback_data,
		      old_begin, old_nr, new_begin, new_nr,
		      func, funclen);
	return 0;
}

static int consume_one(void *priv_, char *s, unsigned long size)
{
	struct xdiff_emit_state *priv = priv_;
	char *ep;
	while (size) {
		unsigned long this_size;
		int ret;
		ep = memchr(s, '\n', size);
		this_size = (ep == NULL) ? size : (ep - s + 1);
		ret = priv->line_fn(priv->consume_callback_data, s, this_size);
		if (ret)
			return ret;
		size -= this_size;
		s += this_size;
	}
	return 0;
}

static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
{
	struct xdiff_emit_state *priv = priv_;
	int i;
	int stop = 0;

	if (!priv->line_fn)
		return 0;

	for (i = 0; i < nbuf; i++) {
		if (stop)
			return 1;
		if (mb[i].ptr[mb[i].size-1] != '\n') {
			/* Incomplete line */
			strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
			continue;
		}

		/* we have a complete line */
		if (!priv->remainder.len) {
			stop = consume_one(priv, mb[i].ptr, mb[i].size);
			continue;
		}
		strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
		stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
		strbuf_reset(&priv->remainder);
	}
	if (stop)
		return -1;
	if (priv->remainder.len) {
		stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
		strbuf_reset(&priv->remainder);
	}
	if (stop)
		return -1;
	return 0;
}

/*
 * Trim down common substring at the end of the buffers,
 * but end on a complete line.
 */
static void trim_common_tail(mmfile_t *a, mmfile_t *b)
{
	const int blk = 1024;
	long trimmed = 0, recovered = 0;
	char *ap = a->size ? a->ptr + a->size : a->ptr;
	char *bp = b->size ? b->ptr + b->size : b->ptr;
	long smaller = (a->size < b->size) ? a->size : b->size;

	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
		trimmed += blk;
		ap -= blk;
		bp -= blk;
	}

	while (recovered < trimmed)
		if (ap[recovered++] == '\n')
			break;
	a->size -= trimmed - recovered;
	b->size -= trimmed - recovered;
}

int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
{
	mmfile_t a = *mf1;
	mmfile_t b = *mf2;

	if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE)
		return -1;

	if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT))
		trim_common_tail(&a, &b);

	return xdl_diff(&a, &b, xpp, xecfg, xecb);
}

int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
		  xdiff_emit_hunk_fn hunk_fn,
		  xdiff_emit_line_fn line_fn,
		  void *consume_callback_data,
		  xpparam_t const *xpp, xdemitconf_t const *xecfg)
{
	int ret;
	struct xdiff_emit_state state;
	xdemitcb_t ecb;

	memset(&state, 0, sizeof(state));
	state.hunk_fn = hunk_fn;
	state.line_fn = line_fn;
	state.consume_callback_data = consume_callback_data;
	memset(&ecb, 0, sizeof(ecb));
	if (hunk_fn)
		ecb.out_hunk = xdiff_out_hunk;
	ecb.out_line = xdiff_outf;
	ecb.priv = &state;
	strbuf_init(&state.remainder, 0);
	ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
	strbuf_release(&state.remainder);
	return ret;
}

int read_mmfile(mmfile_t *ptr, const char *filename)
{
	struct stat st;
	FILE *f;
	size_t sz;

	if (stat(filename, &st))
		return error_errno("Could not stat %s", filename);
	if (!(f = fopen(filename, "rb")))
		return error_errno("Could not open %s", filename);
	sz = xsize_t(st.st_size);
	ptr->ptr = xmalloc(sz ? sz : 1);
	if (sz && fread(ptr->ptr, sz, 1, f) != 1) {
		fclose(f);
		return error("Could not read %s", filename);
	}
	fclose(f);
	ptr->size = sz;
	return 0;
}

void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
{
	unsigned long size;
	enum object_type type;

	if (oideq(oid, null_oid())) {
		ptr->ptr = xstrdup("");
		ptr->size = 0;
		return;
	}

	ptr->ptr = repo_read_object_file(the_repository, oid, &type, &size);
	if (!ptr->ptr || type != OBJ_BLOB)
		die("unable to read blob object %s", oid_to_hex(oid));
	ptr->size = size;
}

#define FIRST_FEW_BYTES 8000
int buffer_is_binary(const char *ptr, unsigned long size)
{
	if (FIRST_FEW_BYTES < size)
		size = FIRST_FEW_BYTES;
	return !!memchr(ptr, 0, size);
}

struct ff_regs {
	int nr;
	struct ff_reg {
		regex_t re;
		int negate;
	} *array;
};

static long ff_regexp(const char *line, long len,
		char *buffer, long buffer_size, void *priv)
{
	struct ff_regs *regs = priv;
	regmatch_t pmatch[2];
	int i;
	int result;

	/* Exclude terminating newline (and cr) from matching */
	if (len > 0 && line[len-1] == '\n') {
		if (len > 1 && line[len-2] == '\r')
			len -= 2;
		else
			len--;
	}

	for (i = 0; i < regs->nr; i++) {
		struct ff_reg *reg = regs->array + i;
		if (!regexec_buf(&reg->re, line, len, 2, pmatch, 0)) {
			if (reg->negate)
				return -1;
			break;
		}
	}
	if (regs->nr <= i)
		return -1;
	i = pmatch[1].rm_so >= 0 ? 1 : 0;
	line += pmatch[i].rm_so;
	result = pmatch[i].rm_eo - pmatch[i].rm_so;
	if (result > buffer_size)
		result = buffer_size;
	while (result > 0 && (isspace(line[result - 1])))
		result--;
	memcpy(buffer, line, result);
	return result;
}

void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
{
	int i;
	struct ff_regs *regs;

	xecfg->find_func = ff_regexp;
	regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
	for (i = 0, regs->nr = 1; value[i]; i++)
		if (value[i] == '\n')
			regs->nr++;
	ALLOC_ARRAY(regs->array, regs->nr);
	for (i = 0; i < regs->nr; i++) {
		struct ff_reg *reg = regs->array + i;
		const char *ep, *expression;
		char *buffer = NULL;

		if (!value)
			BUG("mismatch between line count and parsing");
		ep = strchr(value, '\n');

		reg->negate = (*value == '!');
		if (reg->negate && i == regs->nr - 1)
			die("Last expression must not be negated: %s", value);
		if (*value == '!')
			value++;
		if (ep)
			expression = buffer = xstrndup(value, ep - value);
		else
			expression = value;
		if (regcomp(&reg->re, expression, cflags))
			die("Invalid regexp to look for hunk header: %s", expression);
		free(buffer);
		value = ep ? ep + 1 : NULL;
	}
}

void xdiff_clear_find_func(xdemitconf_t *xecfg)
{
	if (xecfg->find_func) {
		int i;
		struct ff_regs *regs = xecfg->find_func_priv;

		for (i = 0; i < regs->nr; i++)
			regfree(&regs->array[i].re);
		free(regs->array);
		free(regs);
		xecfg->find_func = NULL;
		xecfg->find_func_priv = NULL;
	}
}

unsigned long xdiff_hash_string(const char *s, size_t len, long flags)
{
	return xdl_hash_record(&s, s + len, flags);
}

int xdiff_compare_lines(const char *l1, long s1,
			const char *l2, long s2, long 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_config(const char *var, const char *value,
		      const struct config_context *ctx, void *cb)
{
	if (!strcmp(var, "merge.conflictstyle")) {
		if (!value)
			return config_error_nonbool(var);
		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;
	}
	return git_default_config(var, value, ctx, cb);
}
Commit	Line	Data
4f6728d5	1	#include "git-compat-util.h"
22e27413	2	#include "gettext.h"
b2141fc1	3	#include "config.h"
41771fa4	4	#include "hex.h"
a034e910 EN	5	#include "object-store-ll.h"
a034e910 EN	6	#include "strbuf.h"
d9ea73e0	7	#include "xdiff-interface.h"
86295bb6 RS	8	#include "xdiff/xtypes.h"
86295bb6 RS	9	#include "xdiff/xdiffi.h"
5ec8274b	10	#include "xdiff/xutils.h"
8a3f524b JH	11
8a3f524b JH	12	struct xdiff_emit_state {
9346d6d1 JK	13	xdiff_emit_hunk_fn hunk_fn;
9346d6d1 JK	14	xdiff_emit_line_fn line_fn;
8a3f524b JH	15	void *consume_callback_data;
	16	struct strbuf remainder;
	17	};
d9ea73e0	18
9346d6d1 JK	19	static int xdiff_out_hunk(void *priv_,
	20	long old_begin, long old_nr,
	21	long new_begin, long new_nr,
	22	const char *func, long funclen)
c1e335a4	23	{
9346d6d1	24	struct xdiff_emit_state *priv = priv_;
c1e335a4	25
9346d6d1 JK	26	if (priv->remainder.len)
9346d6d1 JK	27	BUG("xdiff emitted hunk in the middle of a line");
c1e335a4	28
9346d6d1 JK	29	priv->hunk_fn(priv->consume_callback_data,
	30	old_begin, old_nr, new_begin, new_nr,
	31	func, funclen);
	32	return 0;
c1e335a4 JH	33	}
c1e335a4 JH	34
a8d5eb6d	35	static int consume_one(void priv_, char s, unsigned long size)
d9ea73e0 JH	36	{
	37	struct xdiff_emit_state *priv = priv_;
	38	char *ep;
	39	while (size) {
	40	unsigned long this_size;
9e204422	41	int ret;
d9ea73e0 JH	42	ep = memchr(s, '\n', size);
d9ea73e0 JH	43	this_size = (ep == NULL) ? size : (ep - s + 1);
9e204422 ÆAB	44	ret = priv->line_fn(priv->consume_callback_data, s, this_size);
	45	if (ret)
	46	return ret;
d9ea73e0 JH	47	size -= this_size;
	48	s += this_size;
	49	}
a8d5eb6d	50	return 0;
d9ea73e0 JH	51	}
d9ea73e0 JH	52
c99db9d2	53	static int xdiff_outf(void priv_, mmbuffer_t mb, int nbuf)
d9ea73e0 JH	54	{
	55	struct xdiff_emit_state *priv = priv_;
	56	int i;
9e204422	57	int stop = 0;
d9ea73e0	58
7c61e25f JK	59	if (!priv->line_fn)
	60	return 0;
	61
d9ea73e0	62	for (i = 0; i < nbuf; i++) {
9e204422 ÆAB	63	if (stop)
9e204422 ÆAB	64	return 1;
d9ea73e0 JH	65	if (mb[i].ptr[mb[i].size-1] != '\n') {
d9ea73e0 JH	66	/* Incomplete line */
b4637760	67	strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
d9ea73e0 JH	68	continue;
	69	}
	70
	71	/* we have a complete line */
b4637760	72	if (!priv->remainder.len) {
9e204422	73	stop = consume_one(priv, mb[i].ptr, mb[i].size);
d9ea73e0 JH	74	continue;
d9ea73e0 JH	75	}
b4637760	76	strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
9e204422	77	stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
b4637760	78	strbuf_reset(&priv->remainder);
d9ea73e0	79	}
9e204422 ÆAB	80	if (stop)
9e204422 ÆAB	81	return -1;
b4637760	82	if (priv->remainder.len) {
9e204422	83	stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
b4637760	84	strbuf_reset(&priv->remainder);
d9ea73e0	85	}
9e204422 ÆAB	86	if (stop)
9e204422 ÆAB	87	return -1;
d9ea73e0 JH	88	return 0;
d9ea73e0 JH	89	}
7cab5883	90
913b45f5 JH	91	/*
913b45f5 JH	92	* Trim down common substring at the end of the buffers,
e0876bca	93	* but end on a complete line.
913b45f5	94	*/
e0876bca	95	static void trim_common_tail(mmfile_t a, mmfile_t b)
913b45f5 JH	96	{
913b45f5 JH	97	const int blk = 1024;
52499977	98	long trimmed = 0, recovered = 0;
d20bc01a JK	99	char *ap = a->size ? a->ptr + a->size : a->ptr;
d20bc01a JK	100	char *bp = b->size ? b->ptr + b->size : b->ptr;
913b45f5 JH	101	long smaller = (a->size < b->size) ? a->size : b->size;
	102
	103	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
	104	trimmed += blk;
	105	ap -= blk;
	106	bp -= blk;
	107	}
	108
d2f82950	109	while (recovered < trimmed)
52499977	110	if (ap[recovered++] == '\n')
d2f82950 LT	111	break;
	112	a->size -= trimmed - recovered;
	113	b->size -= trimmed - recovered;
913b45f5 JH	114	}
913b45f5 JH	115
c279d7e9 JH	116	int xdi_diff(mmfile_t mf1, mmfile_t mf2, xpparam_t const xpp, xdemitconf_t const xecfg, xdemitcb_t *xecb)
c279d7e9 JH	117	{
913b45f5 JH	118	mmfile_t a = *mf1;
	119	mmfile_t b = *mf2;
	120
dcd1742e JK	121	if (mf1->size > MAX_XDIFF_SIZE \|\| mf2->size > MAX_XDIFF_SIZE)
	122	return -1;
	123
e0876bca RS	124	if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT))
e0876bca RS	125	trim_common_tail(&a, &b);
913b45f5 JH	126
913b45f5 JH	127	return xdl_diff(&a, &b, xpp, xecfg, xecb);
c279d7e9 JH	128	}
c279d7e9 JH	129
c99db9d2	130	int xdi_diff_outf(mmfile_t mf1, mmfile_t mf2,
9346d6d1 JK	131	xdiff_emit_hunk_fn hunk_fn,
	132	xdiff_emit_line_fn line_fn,
	133	void *consume_callback_data,
dfea7900	134	xpparam_t const xpp, xdemitconf_t const xecfg)
c99db9d2 BD	135	{
c99db9d2 BD	136	int ret;
8a3f524b	137	struct xdiff_emit_state state;
dfea7900	138	xdemitcb_t ecb;
8a3f524b JH	139
8a3f524b JH	140	memset(&state, 0, sizeof(state));
9346d6d1 JK	141	state.hunk_fn = hunk_fn;
9346d6d1 JK	142	state.line_fn = line_fn;
8a3f524b	143	state.consume_callback_data = consume_callback_data;
dfea7900	144	memset(&ecb, 0, sizeof(ecb));
9346d6d1 JK	145	if (hunk_fn)
9346d6d1 JK	146	ecb.out_hunk = xdiff_out_hunk;
611e42a5	147	ecb.out_line = xdiff_outf;
dfea7900	148	ecb.priv = &state;
8a3f524b	149	strbuf_init(&state.remainder, 0);
dfea7900	150	ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
8a3f524b	151	strbuf_release(&state.remainder);
c99db9d2 BD	152	return ret;
	153	}
	154
7cab5883 JS	155	int read_mmfile(mmfile_t ptr, const char filename)
	156	{
	157	struct stat st;
	158	FILE *f;
dc49cd76	159	size_t sz;
7cab5883 JS	160
7cab5883 JS	161	if (stat(filename, &st))
5118d7f4	162	return error_errno("Could not stat %s", filename);
afe8a907	163	if (!(f = fopen(filename, "rb")))
5118d7f4	164	return error_errno("Could not open %s", filename);
dc49cd76	165	sz = xsize_t(st.st_size);
381b851c	166	ptr->ptr = xmalloc(sz ? sz : 1);
5fd89814 RS	167	if (sz && fread(ptr->ptr, sz, 1, f) != 1) {
5fd89814 RS	168	fclose(f);
7cab5883	169	return error("Could not read %s", filename);
5fd89814	170	}
7cab5883	171	fclose(f);
dc49cd76	172	ptr->size = sz;
7cab5883 JS	173	return 0;
	174	}
	175
d449347d	176	void read_mmblob(mmfile_t ptr, const struct object_id oid)
06b65939 ML	177	{
	178	unsigned long size;
	179	enum object_type type;
	180
14228447	181	if (oideq(oid, null_oid())) {
06b65939 ML	182	ptr->ptr = xstrdup("");
	183	ptr->size = 0;
	184	return;
	185	}
	186
bc726bd0	187	ptr->ptr = repo_read_object_file(the_repository, oid, &type, &size);
06b65939	188	if (!ptr->ptr \|\| type != OBJ_BLOB)
d449347d	189	die("unable to read blob object %s", oid_to_hex(oid));
06b65939 ML	190	ptr->size = size;
	191	}
	192
6bfce93e JS	193	#define FIRST_FEW_BYTES 8000
	194	int buffer_is_binary(const char *ptr, unsigned long size)
	195	{
	196	if (FIRST_FEW_BYTES < size)
	197	size = FIRST_FEW_BYTES;
	198	return !!memchr(ptr, 0, size);
	199	}
f258475a JH	200
	201	struct ff_regs {
	202	int nr;
	203	struct ff_reg {
	204	regex_t re;
	205	int negate;
	206	} *array;
	207	};
	208
	209	static long ff_regexp(const char *line, long len,
	210	char buffer, long buffer_size, void priv)
	211	{
f258475a JH	212	struct ff_regs *regs = priv;
f258475a JH	213	regmatch_t pmatch[2];
3d8dccd7	214	int i;
b7d36ffc	215	int result;
f258475a	216
a5a5a048 BC	217	/* Exclude terminating newline (and cr) from matching */
a5a5a048 BC	218	if (len > 0 && line[len-1] == '\n') {
46dc1b0e JH	219	if (len > 1 && line[len-2] == '\r')
	220	len -= 2;
	221	else
	222	len--;
	223	}
	224
f258475a JH	225	for (i = 0; i < regs->nr; i++) {
f258475a JH	226	struct ff_reg *reg = regs->array + i;
b7d36ffc	227	if (!regexec_buf(&reg->re, line, len, 2, pmatch, 0)) {
3d8dccd7	228	if (reg->negate)
b7d36ffc	229	return -1;
3d8dccd7	230	break;
f258475a JH	231	}
f258475a JH	232	}
3d8dccd7	233	if (regs->nr <= i)
b7d36ffc	234	return -1;
f258475a JH	235	i = pmatch[1].rm_so >= 0 ? 1 : 0;
	236	line += pmatch[i].rm_so;
	237	result = pmatch[i].rm_eo - pmatch[i].rm_so;
	238	if (result > buffer_size)
	239	result = buffer_size;
1b6ecbad BC	240	while (result > 0 && (isspace(line[result - 1])))
1b6ecbad BC	241	result--;
f258475a	242	memcpy(buffer, line, result);
f258475a JH	243	return result;
	244	}
	245
a013585b	246	void xdiff_set_find_func(xdemitconf_t xecfg, const char value, int cflags)
f258475a JH	247	{
	248	int i;
	249	struct ff_regs *regs;
	250
	251	xecfg->find_func = ff_regexp;
	252	regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
	253	for (i = 0, regs->nr = 1; value[i]; i++)
	254	if (value[i] == '\n')
	255	regs->nr++;
b32fa95f	256	ALLOC_ARRAY(regs->array, regs->nr);
f258475a JH	257	for (i = 0; i < regs->nr; i++) {
f258475a JH	258	struct ff_reg *reg = regs->array + i;
3cd309c1	259	const char ep, expression;
f258475a JH	260	char *buffer = NULL;
f258475a JH	261
3cd309c1 JK	262	if (!value)
	263	BUG("mismatch between line count and parsing");
	264	ep = strchr(value, '\n');
	265
f258475a JH	266	reg->negate = (*value == '!');
	267	if (reg->negate && i == regs->nr - 1)
	268	die("Last expression must not be negated: %s", value);
	269	if (*value == '!')
	270	value++;
	271	if (ep)
	272	expression = buffer = xstrndup(value, ep - value);
	273	else
	274	expression = value;
a013585b	275	if (regcomp(&reg->re, expression, cflags))
f258475a	276	die("Invalid regexp to look for hunk header: %s", expression);
8e0f7003	277	free(buffer);
3cd309c1	278	value = ep ? ep + 1 : NULL;
f258475a JH	279	}
f258475a JH	280	}
b5412484	281
8cfe5f1c RS	282	void xdiff_clear_find_func(xdemitconf_t *xecfg)
	283	{
	284	if (xecfg->find_func) {
	285	int i;
	286	struct ff_regs *regs = xecfg->find_func_priv;
	287
	288	for (i = 0; i < regs->nr; i++)
	289	regfree(&regs->array[i].re);
	290	free(regs->array);
	291	free(regs);
	292	xecfg->find_func = NULL;
	293	xecfg->find_func_priv = NULL;
	294	}
	295	}
	296
5ec8274b SB	297	unsigned long xdiff_hash_string(const char *s, size_t len, long flags)
	298	{
	299	return xdl_hash_record(&s, s + len, flags);
	300	}
	301
	302	int xdiff_compare_lines(const char *l1, long s1,
	303	const char *l2, long s2, long flags)
	304	{
	305	return xdl_recmatch(l1, s1, l2, s2, flags);
	306	}
	307
7457014b PW	308	int parse_conflict_style_name(const char *value)
	309	{
	310	if (!strcmp(value, "diff3"))
	311	return XDL_MERGE_DIFF3;
	312	else if (!strcmp(value, "zdiff3"))
	313	return XDL_MERGE_ZEALOUS_DIFF3;
	314	else if (!strcmp(value, "merge"))
	315	return 0;
	316	/*
	317	* Please update _git_checkout() in git-completion.bash when
	318	* you add new merge config
	319	*/
	320	else
	321	return -1;
	322	}
	323
b5412484 JH	324	int git_xmerge_style = -1;
b5412484 JH	325
a4e7e317 GC	326	int git_xmerge_config(const char var, const char value,
a4e7e317 GC	327	const struct config_context ctx, void cb)
b5412484	328	{
8c2be75f	329	if (!strcmp(var, "merge.conflictstyle")) {
b5412484	330	if (!value)
92cecce0	331	return config_error_nonbool(var);
7457014b PW	332	git_xmerge_style = parse_conflict_style_name(value);
7457014b PW	333	if (git_xmerge_style == -1)
22e27413 JK	334	return error(_("unknown style '%s' given for '%s'"),
22e27413 JK	335	value, var);
b5412484 JH	336	return 0;
b5412484 JH	337	}
a4e7e317	338	return git_default_config(var, value, ctx, cb);
b5412484	339	}