diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:05:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:05:39 -0800 |
| commit | 1e2bba92d21d9c72d4a6816c3a98a22779856f9e (patch) | |
| tree | 94f9729fb9c5ea36d305ffaeac22f9e957998f4d /merge-file.c | |
| parent | 6abe9c87c78d4925e12e609f4f26447c6a579b9e (diff) | |
| parent | cdcab133ea75e0bd5c2279ce6c5718f4af4d9a03 (diff) | |
| download | git-1e2bba92d21d9c72d4a6816c3a98a22779856f9e.tar.gz git-1e2bba92d21d9c72d4a6816c3a98a22779856f9e.tar.xz | |
Merge branch 'rs/blame'
* rs/blame:
blame: use xdi_diff_hunks(), get rid of struct patch
add xdi_diff_hunks() for callers that only need hunk lengths
Allow alternate "low-level" emit function from xdl_diff
Always initialize xpparam_t to 0
blame: inline get_patch()
Diffstat (limited to 'merge-file.c')
| -rw-r--r-- | merge-file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-file.c b/merge-file.c index 2a939c9dd..3120a95f7 100644 --- a/merge-file.c +++ b/merge-file.c @@ -61,6 +61,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2) xdemitconf_t xecfg; xdemitcb_t ecb; + memset(&xpp, 0, sizeof(xpp)); xpp.flags = XDF_NEED_MINIMAL; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; |