Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
githooks documentation: add a note about the +x mode
[gitweb.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index 5aa1104d3480f8057dd71c49bcf300eccabe2f9d..ec8df39bb01347eb035ad94553357b80af652b78 100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-213,6
+213,7
@@
static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
parent_file.ptr = grab_blob(parent, &sz);
parent_file.size = sz;
+ memset(&xpp, 0, sizeof(xpp));
xpp.flags = XDF_NEED_MINIMAL;
memset(&xecfg, 0, sizeof(xecfg));
memset(&state, 0, sizeof(state));