summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-04 18:05:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-06 07:22:12 (GMT)
commit30b250104d9307e1225031c7fc39b66643265ed1 (patch)
tree73b3d00a0e5743a1a4b70937c9f83c78224e6609 /merge-file.c
parent29a3eefde111f6a24292163c4308f00ab3572627 (diff)
downloadgit-30b250104d9307e1225031c7fc39b66643265ed1.zip
git-30b250104d9307e1225031c7fc39b66643265ed1.tar.gz
git-30b250104d9307e1225031c7fc39b66643265ed1.tar.bz2
Future-proof source for changes in xdemitconf_t
The instances of xdemitconf_t were initialized member by member. Instead, initialize them to all zero, so we do not have to update those places each time we introduce a new member. [jc: minimally fixed by getting rid of a new global] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
-rw-r--r--merge-file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-file.c b/merge-file.c
index 748d15c..1e031ea 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -62,6 +62,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
xdemitcb_t ecb;
xpp.flags = XDF_NEED_MINIMAL;
+ memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
xecfg.flags = XDL_EMIT_COMMON;
ecb.outf = common_outf;