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

#include "cache.h"
#include "xdiff-interface.h"
#include "xdiff/xtypes.h"
#include "xdiff/xdiffi.h"
#include "xdiff/xemit.h"
#include "xdiff/xmacros.h"

struct xdiff_emit_state {
	xdiff_emit_consume_fn consume;
	void *consume_callback_data;
	struct strbuf remainder;
};

static int parse_num(char **cp_p, int *num_p)
{
	char *cp = *cp_p;
	int num = 0;

	while ('0' <= *cp && *cp <= '9')
		num = num * 10 + *cp++ - '0';
	if (!(cp - *cp_p))
		return -1;
	*cp_p = cp;
	*num_p = num;
	return 0;
}

int parse_hunk_header(char *line, int len,
		      int *ob, int *on,
		      int *nb, int *nn)
{
	char *cp;
	cp = line + 4;
	if (parse_num(&cp, ob)) {
	bad_line:
		return error("malformed diff output: %s", line);
	}
	if (*cp == ',') {
		cp++;
		if (parse_num(&cp, on))
			goto bad_line;
	}
	else
		*on = 1;
	if (*cp++ != ' ' || *cp++ != '+')
		goto bad_line;
	if (parse_num(&cp, nb))
		goto bad_line;
	if (*cp == ',') {
		cp++;
		if (parse_num(&cp, nn))
			goto bad_line;
	}
	else
		*nn = 1;
	return -!!memcmp(cp, " @@", 3);
}

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

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

	for (i = 0; i < nbuf; i++) {
		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) {
			consume_one(priv, mb[i].ptr, mb[i].size);
			continue;
		}
		strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
		consume_one(priv, priv->remainder.buf, priv->remainder.len);
		strbuf_reset(&priv->remainder);
	}
	if (priv->remainder.len) {
		consume_one(priv, priv->remainder.buf, priv->remainder.len);
		strbuf_reset(&priv->remainder);
	}
	return 0;
}

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

	if (ctx)
		return;

	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;

	trim_common_tail(&a, &b, xecfg->ctxlen);

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

int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
		  xdiff_emit_consume_fn 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.consume = fn;
	state.consume_callback_data = consume_callback_data;
	memset(&ecb, 0, sizeof(ecb));
	ecb.outf = xdiff_outf;
	ecb.priv = &state;
	strbuf_init(&state.remainder, 0);
	ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
	strbuf_release(&state.remainder);
	return ret;
}

struct xdiff_emit_hunk_state {
	xdiff_emit_hunk_consume_fn consume;
	void *consume_callback_data;
};

static int process_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
			xdemitconf_t const *xecfg)
{
	long s1, s2, same, p_next, t_next;
	xdchange_t *xch, *xche;
	struct xdiff_emit_hunk_state *state = ecb->priv;
	xdiff_emit_hunk_consume_fn fn = state->consume;
	void *consume_callback_data = state->consume_callback_data;

	for (xch = xscr; xch; xch = xche->next) {
		xche = xdl_get_hunk(xch, xecfg);

		s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
		s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
		same = s2 + XDL_MAX(xch->i1 - s1, 0);
		p_next = xche->i1 + xche->chg1;
		t_next = xche->i2 + xche->chg2;

		fn(consume_callback_data, same, p_next, t_next);
	}
	return 0;
}

int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
		   xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
		   xpparam_t const *xpp, xdemitconf_t *xecfg)
{
	struct xdiff_emit_hunk_state state;
	xdemitcb_t ecb;

	memset(&state, 0, sizeof(state));
	memset(&ecb, 0, sizeof(ecb));
	state.consume = fn;
	state.consume_callback_data = consume_callback_data;
	xecfg->emit_func = (void (*)())process_diff;
	ecb.priv = &state;
	return xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
}

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

	if (stat(filename, &st))
		return error("Could not stat %s", filename);
	if ((f = fopen(filename, "rb")) == NULL)
		return error("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)
		return error("Could not read %s", filename);
	fclose(f);
	ptr->size = sz;
	return 0;
}

void read_mmblob(mmfile_t *ptr, const unsigned char *sha1)
{
	unsigned long size;
	enum object_type type;

	if (!hashcmp(sha1, null_sha1)) {
		ptr->ptr = xstrdup("");
		ptr->size = 0;
		return;
	}

	ptr->ptr = read_sha1_file(sha1, &type, &size);
	if (!ptr->ptr || type != OBJ_BLOB)
		die("unable to read blob object %s", sha1_to_hex(sha1));
	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)
{
	char *line_buffer;
	struct ff_regs *regs = priv;
	regmatch_t pmatch[2];
	int i;
	int result = -1;

	/* 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--;
	}

	line_buffer = xstrndup(line, len); /* make NUL terminated */

	for (i = 0; i < regs->nr; i++) {
		struct ff_reg *reg = regs->array + i;
		if (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {
			if (reg->negate)
				goto fail;
			break;
		}
	}
	if (regs->nr <= i)
		goto fail;
	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;
	else
		while (result > 0 && (isspace(line[result - 1])))
			result--;
	memcpy(buffer, line, result);
 fail:
	free(line_buffer);
	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++;
	regs->array = xmalloc(regs->nr * sizeof(struct ff_reg));
	for (i = 0; i < regs->nr; i++) {
		struct ff_reg *reg = regs->array + i;
		const char *ep = strchr(value, '\n'), *expression;
		char *buffer = NULL;

		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 + 1;
	}
}

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;
	}
}

int git_xmerge_style = -1;

int git_xmerge_config(const char *var, const char *value, void *cb)
{
	if (!strcasecmp(var, "merge.conflictstyle")) {
		if (!value)
			die("'%s' is not a boolean", var);
		if (!strcmp(value, "diff3"))
			git_xmerge_style = XDL_MERGE_DIFF3;
		else if (!strcmp(value, "merge"))
			git_xmerge_style = 0;
		else
			die("unknown style '%s' given for '%s'",
			    value, var);
		return 0;
	}
	return git_default_config(var, value, cb);
}
Commit	Line	Data
d9ea73e0 JH	1	#include "cache.h"
d9ea73e0 JH	2	#include "xdiff-interface.h"
86295bb6 RS	3	#include "xdiff/xtypes.h"
	4	#include "xdiff/xdiffi.h"
	5	#include "xdiff/xemit.h"
	6	#include "xdiff/xmacros.h"
8a3f524b JH	7
	8	struct xdiff_emit_state {
	9	xdiff_emit_consume_fn consume;
	10	void *consume_callback_data;
	11	struct strbuf remainder;
	12	};
d9ea73e0	13
a0fd3146	14	static int parse_num(char *cp_p, int num_p)
c1e335a4 JH	15	{
c1e335a4 JH	16	char cp = cp_p;
a0fd3146	17	int num = 0;
c1e335a4 JH	18
	19	while ('0' <= cp && cp <= '9')
	20	num = num * 10 + *cp++ - '0';
eb3a9dd3	21	if (!(cp - *cp_p))
c1e335a4 JH	22	return -1;
	23	*cp_p = cp;
	24	*num_p = num;
	25	return 0;
	26	}
	27
	28	int parse_hunk_header(char *line, int len,
a0fd3146 JH	29	int ob, int on,
a0fd3146 JH	30	int nb, int nn)
c1e335a4 JH	31	{
	32	char *cp;
	33	cp = line + 4;
	34	if (parse_num(&cp, ob)) {
	35	bad_line:
	36	return error("malformed diff output: %s", line);
	37	}
	38	if (*cp == ',') {
	39	cp++;
	40	if (parse_num(&cp, on))
	41	goto bad_line;
	42	}
	43	else
	44	*on = 1;
	45	if (cp++ != ' ' \|\| cp++ != '+')
	46	goto bad_line;
	47	if (parse_num(&cp, nb))
	48	goto bad_line;
	49	if (*cp == ',') {
	50	cp++;
	51	if (parse_num(&cp, nn))
	52	goto bad_line;
	53	}
	54	else
	55	*nn = 1;
	56	return -!!memcmp(cp, " @@", 3);
	57	}
	58
d9ea73e0 JH	59	static void consume_one(void priv_, char s, unsigned long size)
	60	{
	61	struct xdiff_emit_state *priv = priv_;
	62	char *ep;
	63	while (size) {
	64	unsigned long this_size;
	65	ep = memchr(s, '\n', size);
	66	this_size = (ep == NULL) ? size : (ep - s + 1);
8a3f524b	67	priv->consume(priv->consume_callback_data, s, this_size);
d9ea73e0 JH	68	size -= this_size;
	69	s += this_size;
	70	}
	71	}
	72
c99db9d2	73	static int xdiff_outf(void priv_, mmbuffer_t mb, int nbuf)
d9ea73e0 JH	74	{
	75	struct xdiff_emit_state *priv = priv_;
	76	int i;
	77
	78	for (i = 0; i < nbuf; i++) {
	79	if (mb[i].ptr[mb[i].size-1] != '\n') {
	80	/* Incomplete line */
b4637760	81	strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
d9ea73e0 JH	82	continue;
	83	}
	84
	85	/* we have a complete line */
b4637760	86	if (!priv->remainder.len) {
d9ea73e0 JH	87	consume_one(priv, mb[i].ptr, mb[i].size);
	88	continue;
	89	}
b4637760 BD	90	strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
	91	consume_one(priv, priv->remainder.buf, priv->remainder.len);
	92	strbuf_reset(&priv->remainder);
d9ea73e0	93	}
b4637760 BD	94	if (priv->remainder.len) {
	95	consume_one(priv, priv->remainder.buf, priv->remainder.len);
	96	strbuf_reset(&priv->remainder);
d9ea73e0 JH	97	}
	98	return 0;
	99	}
7cab5883	100
913b45f5 JH	101	/*
	102	* Trim down common substring at the end of the buffers,
	103	* but leave at least ctx lines at the end.
	104	*/
29ab27f4	105	static void trim_common_tail(mmfile_t a, mmfile_t b, long ctx)
913b45f5 JH	106	{
913b45f5 JH	107	const int blk = 1024;
52499977	108	long trimmed = 0, recovered = 0;
913b45f5 JH	109	char *ap = a->ptr + a->size;
	110	char *bp = b->ptr + b->size;
	111	long smaller = (a->size < b->size) ? a->size : b->size;
	112
d2f82950 LT	113	if (ctx)
	114	return;
	115
913b45f5 JH	116	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
	117	trimmed += blk;
	118	ap -= blk;
	119	bp -= blk;
	120	}
	121
d2f82950	122	while (recovered < trimmed)
52499977	123	if (ap[recovered++] == '\n')
d2f82950 LT	124	break;
	125	a->size -= trimmed - recovered;
	126	b->size -= trimmed - recovered;
913b45f5 JH	127	}
913b45f5 JH	128
c279d7e9 JH	129	int xdi_diff(mmfile_t mf1, mmfile_t mf2, xpparam_t const xpp, xdemitconf_t const xecfg, xdemitcb_t *xecb)
c279d7e9 JH	130	{
913b45f5 JH	131	mmfile_t a = *mf1;
	132	mmfile_t b = *mf2;
	133
	134	trim_common_tail(&a, &b, xecfg->ctxlen);
	135
	136	return xdl_diff(&a, &b, xpp, xecfg, xecb);
c279d7e9 JH	137	}
c279d7e9 JH	138
c99db9d2	139	int xdi_diff_outf(mmfile_t mf1, mmfile_t mf2,
8a3f524b	140	xdiff_emit_consume_fn fn, void *consume_callback_data,
dfea7900	141	xpparam_t const xpp, xdemitconf_t const xecfg)
c99db9d2 BD	142	{
c99db9d2 BD	143	int ret;
8a3f524b	144	struct xdiff_emit_state state;
dfea7900	145	xdemitcb_t ecb;
8a3f524b JH	146
	147	memset(&state, 0, sizeof(state));
	148	state.consume = fn;
	149	state.consume_callback_data = consume_callback_data;
dfea7900 RS	150	memset(&ecb, 0, sizeof(ecb));
	151	ecb.outf = xdiff_outf;
	152	ecb.priv = &state;
8a3f524b	153	strbuf_init(&state.remainder, 0);
dfea7900	154	ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
8a3f524b	155	strbuf_release(&state.remainder);
c99db9d2 BD	156	return ret;
	157	}
	158
86295bb6 RS	159	struct xdiff_emit_hunk_state {
	160	xdiff_emit_hunk_consume_fn consume;
	161	void *consume_callback_data;
	162	};
	163
	164	static int process_diff(xdfenv_t xe, xdchange_t xscr, xdemitcb_t *ecb,
	165	xdemitconf_t const *xecfg)
	166	{
	167	long s1, s2, same, p_next, t_next;
	168	xdchange_t xch, xche;
	169	struct xdiff_emit_hunk_state *state = ecb->priv;
	170	xdiff_emit_hunk_consume_fn fn = state->consume;
	171	void *consume_callback_data = state->consume_callback_data;
	172
	173	for (xch = xscr; xch; xch = xche->next) {
	174	xche = xdl_get_hunk(xch, xecfg);
	175
	176	s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
	177	s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
	178	same = s2 + XDL_MAX(xch->i1 - s1, 0);
	179	p_next = xche->i1 + xche->chg1;
	180	t_next = xche->i2 + xche->chg2;
	181
	182	fn(consume_callback_data, same, p_next, t_next);
	183	}
	184	return 0;
	185	}
	186
	187	int xdi_diff_hunks(mmfile_t mf1, mmfile_t mf2,
	188	xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
	189	xpparam_t const xpp, xdemitconf_t xecfg)
	190	{
	191	struct xdiff_emit_hunk_state state;
	192	xdemitcb_t ecb;
	193
	194	memset(&state, 0, sizeof(state));
	195	memset(&ecb, 0, sizeof(ecb));
	196	state.consume = fn;
	197	state.consume_callback_data = consume_callback_data;
	198	xecfg->emit_func = (void (*)())process_diff;
	199	ecb.priv = &state;
	200	return xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
	201	}
	202
7cab5883 JS	203	int read_mmfile(mmfile_t ptr, const char filename)
	204	{
	205	struct stat st;
	206	FILE *f;
dc49cd76	207	size_t sz;
7cab5883 JS	208
	209	if (stat(filename, &st))
	210	return error("Could not stat %s", filename);
	211	if ((f = fopen(filename, "rb")) == NULL)
	212	return error("Could not open %s", filename);
dc49cd76	213	sz = xsize_t(st.st_size);
381b851c JS	214	ptr->ptr = xmalloc(sz ? sz : 1);
381b851c JS	215	if (sz && fread(ptr->ptr, sz, 1, f) != 1)
7cab5883 JS	216	return error("Could not read %s", filename);
7cab5883 JS	217	fclose(f);
dc49cd76	218	ptr->size = sz;
7cab5883 JS	219	return 0;
	220	}
	221
06b65939 ML	222	void read_mmblob(mmfile_t ptr, const unsigned char sha1)
	223	{
	224	unsigned long size;
	225	enum object_type type;
	226
	227	if (!hashcmp(sha1, null_sha1)) {
	228	ptr->ptr = xstrdup("");
	229	ptr->size = 0;
	230	return;
	231	}
	232
	233	ptr->ptr = read_sha1_file(sha1, &type, &size);
	234	if (!ptr->ptr \|\| type != OBJ_BLOB)
	235	die("unable to read blob object %s", sha1_to_hex(sha1));
	236	ptr->size = size;
	237	}
	238
6bfce93e JS	239	#define FIRST_FEW_BYTES 8000
	240	int buffer_is_binary(const char *ptr, unsigned long size)
	241	{
	242	if (FIRST_FEW_BYTES < size)
	243	size = FIRST_FEW_BYTES;
	244	return !!memchr(ptr, 0, size);
	245	}
f258475a JH	246
	247	struct ff_regs {
	248	int nr;
	249	struct ff_reg {
	250	regex_t re;
	251	int negate;
	252	} *array;
	253	};
	254
	255	static long ff_regexp(const char *line, long len,
	256	char buffer, long buffer_size, void priv)
	257	{
a5a5a048	258	char *line_buffer;
f258475a JH	259	struct ff_regs *regs = priv;
f258475a JH	260	regmatch_t pmatch[2];
3d8dccd7 JH	261	int i;
3d8dccd7 JH	262	int result = -1;
f258475a	263
a5a5a048 BC	264	/* Exclude terminating newline (and cr) from matching */
a5a5a048 BC	265	if (len > 0 && line[len-1] == '\n') {
46dc1b0e JH	266	if (len > 1 && line[len-2] == '\r')
	267	len -= 2;
	268	else
	269	len--;
	270	}
	271
	272	line_buffer = xstrndup(line, len); /* make NUL terminated */
f258475a JH	273
	274	for (i = 0; i < regs->nr; i++) {
	275	struct ff_reg *reg = regs->array + i;
3d8dccd7 JH	276	if (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {
	277	if (reg->negate)
	278	goto fail;
	279	break;
f258475a JH	280	}
f258475a JH	281	}
3d8dccd7 JH	282	if (regs->nr <= i)
3d8dccd7 JH	283	goto fail;
f258475a JH	284	i = pmatch[1].rm_so >= 0 ? 1 : 0;
	285	line += pmatch[i].rm_so;
	286	result = pmatch[i].rm_eo - pmatch[i].rm_so;
	287	if (result > buffer_size)
	288	result = buffer_size;
	289	else
3d8dccd7	290	while (result > 0 && (isspace(line[result - 1])))
f258475a JH	291	result--;
f258475a JH	292	memcpy(buffer, line, result);
3d8dccd7	293	fail:
f258475a JH	294	free(line_buffer);
	295	return result;
	296	}
	297
a013585b	298	void xdiff_set_find_func(xdemitconf_t xecfg, const char value, int cflags)
f258475a JH	299	{
	300	int i;
	301	struct ff_regs *regs;
	302
	303	xecfg->find_func = ff_regexp;
	304	regs = xecfg->find_func_priv = xmalloc(sizeof(struct ff_regs));
	305	for (i = 0, regs->nr = 1; value[i]; i++)
	306	if (value[i] == '\n')
	307	regs->nr++;
	308	regs->array = xmalloc(regs->nr * sizeof(struct ff_reg));
	309	for (i = 0; i < regs->nr; i++) {
	310	struct ff_reg *reg = regs->array + i;
	311	const char ep = strchr(value, '\n'), expression;
	312	char *buffer = NULL;
	313
	314	reg->negate = (*value == '!');
	315	if (reg->negate && i == regs->nr - 1)
	316	die("Last expression must not be negated: %s", value);
	317	if (*value == '!')
	318	value++;
	319	if (ep)
	320	expression = buffer = xstrndup(value, ep - value);
	321	else
	322	expression = value;
a013585b	323	if (regcomp(&reg->re, expression, cflags))
f258475a	324	die("Invalid regexp to look for hunk header: %s", expression);
8e0f7003	325	free(buffer);
f258475a JH	326	value = ep + 1;
	327	}
	328	}
b5412484	329
8cfe5f1c RS	330	void xdiff_clear_find_func(xdemitconf_t *xecfg)
	331	{
	332	if (xecfg->find_func) {
	333	int i;
	334	struct ff_regs *regs = xecfg->find_func_priv;
	335
	336	for (i = 0; i < regs->nr; i++)
	337	regfree(&regs->array[i].re);
	338	free(regs->array);
	339	free(regs);
	340	xecfg->find_func = NULL;
	341	xecfg->find_func_priv = NULL;
	342	}
	343	}
	344
b5412484 JH	345	int git_xmerge_style = -1;
	346
	347	int git_xmerge_config(const char var, const char value, void *cb)
	348	{
	349	if (!strcasecmp(var, "merge.conflictstyle")) {
	350	if (!value)
	351	die("'%s' is not a boolean", var);
	352	if (!strcmp(value, "diff3"))
	353	git_xmerge_style = XDL_MERGE_DIFF3;
	354	else if (!strcmp(value, "merge"))
	355	git_xmerge_style = 0;
	356	else
	357	die("unknown style '%s' given for '%s'",
	358	value, var);
	359	return 0;
	360	}
	361	return git_default_config(var, value, cb);
	362	}