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

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