X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=xdiff-interface.c;h=4b8e5cca804198b0e227454a585fa025281bbe2d;hb=55029ae4dac07942437c0c715ea7c8ac60dd3576;hp=9ee877c6f4d281ad86c8760aa9ee7b4289f647ac;hpb=079fe1dae8504c988c50ce41eba78743d3f588e0;p=git.git

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 9ee877c6f..4b8e5cca8 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -115,17 +115,20 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
 	char *bp = b->ptr + b->size;
 	long smaller = (a->size < b->size) ? a->size : b->size;
 
+	if (ctx)
+		return;
+
 	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
 		trimmed += blk;
 		ap -= blk;
 		bp -= blk;
 	}
 
-	while (recovered < trimmed && 0 <= ctx)
+	while (recovered < trimmed)
 		if (ap[recovered++] == '\n')
-			ctx--;
-	a->size -= (trimmed - recovered);
-	b->size -= (trimmed - recovered);
+			break;
+	a->size -= trimmed - recovered;
+	b->size -= trimmed - recovered;
 }
 
 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)