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

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