Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint

diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index 130ceeed887099dbedf3f083209fe9d58b828353..18f6f997c321b5ac1f4d4211a4d448dc8542c22f 100644 (file)
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -323,11 +323,10 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env,
                result = fall_back_to_classic_diff(&index, line1, count1, line2, count2);
        else {
                if (lcs.begin1 == 0 && lcs.begin2 == 0) {
-                       int ptr;
-                       for (ptr = 0; ptr < count1; ptr++)
-                               env->xdf1.rchg[line1 + ptr - 1] = 1;
-                       for (ptr = 0; ptr < count2; ptr++)
-                               env->xdf2.rchg[line2 + ptr - 1] = 1;
+                       while (count1--)
+                               env->xdf1.rchg[line1++ - 1] = 1;
+                       while (count2--)
+                               env->xdf2.rchg[line2++ - 1] = 1;
                        result = 0;
                } else {
                        result = histogram_diff(xpp, env,