diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-07 13:37:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-07 13:37:32 -0700 |
| commit | e3c76dbd0f7531eaed3ca8ec0000f03499839304 (patch) | |
| tree | abfeb18cc08e1465390443e12ae7c3d8c7b1cd5b /builtin-blame.c | |
| parent | 0707a9d6f200bbafc02d13dd7f2c12bb795999f6 (diff) | |
| parent | 2c3fa66f3577d1305fb0fac5a181261fb2597859 (diff) | |
| download | git-e3c76dbd0f7531eaed3ca8ec0000f03499839304.tar.gz | |
Merge branch 'jc/diff-mark'
* jc/diff-mark:
diff: honor binariness specified in attributes
Fix configuration syntax to specify customized hunk header patterns.
Per-path attribute based hunk header selection.
Future-proof source for changes in xdemitconf_t
Introduce diff_filespec_is_binary()
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index da23a6f9c9..0519339098 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -518,8 +518,8 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o, xdemitcb_t ecb; xpp.flags = xdl_opts; + memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = context; - xecfg.flags = 0; ecb.outf = xdiff_outf; ecb.priv = &state; memset(&state, 0, sizeof(state)); |