diff options
| author | Jeff King <peff@peff.net> | 2016-02-23 01:07:25 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 22:36:09 -0800 |
| commit | 907681e940d095a0ab96756a8cddfd4f63cd71e1 (patch) | |
| tree | 720c3d2f5af7066bff93229b801dc59def61f246 /xdiff/xemit.c | |
| parent | b779b3a199d9d11e60e522288c84ece5d20dcc2c (diff) | |
| download | git-907681e940d095a0ab96756a8cddfd4f63cd71e1.tar.gz | |
xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-common
There are no more callers that use this mode, and none
likely to be added (as our xdl_merge() eliminates the common
use of it for generating 3-way merge bases).
This is effectively a revert of a9ed376 (xdiff: generate
"anti-diffs" aka what is common to two files, 2006-06-28),
though of course trying to revert that ancient commit
directly produces many textual conflicts.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xemit.c')
| -rw-r--r-- | xdiff/xemit.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 4266ada23f..993724b11c 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -120,21 +120,6 @@ static long def_ff(const char *rec, long len, char *buf, long sz, void *priv) return -1; } -static int xdl_emit_common(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg) { - xdfile_t *xdf = &xe->xdf2; - const char *rchg = xdf->rchg; - long ix; - - for (ix = 0; ix < xdf->nrec; ix++) { - if (rchg[ix]) - continue; - if (xdl_emit_record(xdf, ix, "", ecb)) - return -1; - } - return 0; -} - struct func_line { long len; char buf[80]; @@ -170,9 +155,6 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, long funclineprev = -1; struct func_line func_line = { 0 }; - if (xecfg->flags & XDL_EMIT_COMMON) - return xdl_emit_common(xe, xscr, ecb, xecfg); - for (xch = xscr; xch; xch = xche->next) { xche = xdl_get_hunk(&xch, xecfg); if (!xch) |