Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
[gitweb.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index ea3ca5f950561a92fdd3be1a4ee4bbd726656118..ef622340a52afb3b31b1cdf678ae0a83fb85c923 100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-215,8
+215,7
@@
static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
parent_file.ptr = grab_blob(parent, &sz);
parent_file.size = sz;
xpp.flags = XDF_NEED_MINIMAL;
- xecfg.ctxlen = 0;
- xecfg.flags = 0;
+ memset(&xecfg, 0, sizeof(xecfg));
ecb.outf = xdiff_outf;
ecb.priv = &state;
memset(&state, 0, sizeof(state));