path: root/xdiff
diff options
authorRené Scharfe <>2016-09-14 16:05:27 (GMT)
committerJunio C Hamano <>2016-09-14 23:07:21 (GMT)
commit45d2f75f913c0545be473db1dc2595a1600413f5 (patch)
tree7e8fdfcb8af1d601222425123753df23686c91ff /xdiff
parent0202c411edc25940cc381bf317badcdf67670be4 (diff)
xdiff: fix merging of hunks with -W context and -u context
If the function context for a hunk (with -W) reaches the beginning of the next hunk then we need to merge these two -- otherwise we'd show some lines twice, which looks strange and even confuses git apply. We already do this checking and merging in xdl_emit_diff(), but forget to consider regular context (with -u or -U). Fix that by merging hunks already if function context of the first one touches or overlaps regular context of the second one. Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'xdiff')
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 49aa16f..5079029 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -248,7 +248,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
if (xche->next) {
long l = XDL_MIN(xche->next->i1,
xe->xdf1.nrec - 1);
- if (l <= e1 ||
+ if (l - xecfg->ctxlen <= e1 ||
get_func_line(xe, xecfg, NULL, l, e1) < 0) {
xche = xche->next;
goto post_context_calculation;