Merge branch 'pb/prepare-commit-msg'

[git.git] / xdiff-interface.c

diff --git a/xdiff-interface.c b/xdiff-interface.c
index f2cd488de03beabea4bae32b69008157612618e4..4b8e5cca804198b0e227454a585fa025281bbe2d 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -107,27 +107,28 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
  * Trim down common substring at the end of the buffers,
  * but leave at least ctx lines at the end.
  */
-static void trim_common_tail(mmfile_t *a, mmfile_t *b, int ctx)
+static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
 {
        const int blk = 1024;
        long trimmed = 0, recovered = 0;
-       int i;
        char *ap = a->ptr + a->size;
        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;
        }
 
-       for (i = 0, recovered = 0; recovered < trimmed && i <= ctx; i++) {
-               while (recovered < trimmed && ap[recovered] != '\n')
-                       recovered++;
-       }
-       a->size -= (trimmed - recovered);
-       b->size -= (trimmed - recovered);
+       while (recovered < trimmed)
+               if (ap[recovered++] == '\n')
+                       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)