diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-04 19:05:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-06 00:22:12 -0700 |
| commit | 30b250104d9307e1225031c7fc39b66643265ed1 (patch) | |
| tree | 73b3d00a0e5743a1a4b70937c9f83c78224e6609 /merge-tree.c | |
| parent | 29a3eefde111f6a24292163c4308f00ab3572627 (diff) | |
| download | git-30b250104d9307e1225031c7fc39b66643265ed1.tar.gz | |
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-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c index 3b8d9e6887..7d4f628444 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -106,8 +106,8 @@ static void show_diff(struct merge_list *entry) xdemitcb_t ecb; xpp.flags = XDF_NEED_MINIMAL; + memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; - xecfg.flags = 0; ecb.outf = show_outf; ecb.priv = NULL; |