Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint

diff --git a/diff-delta.c b/diff-delta.c
index 93385e12baa0d90ae475bd02500edf5ddcce320c..3797ce6041981d1facda44d3a95d4448dbb8a091 100644 (file)
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -155,7 +155,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
                entries = 0xfffffffeU / RABIN_WINDOW;
        }
        hsize = entries / 4;
-       for (i = 4; (1u << i) < hsize && i < 31; i++);
+       for (i = 4; (1u << i) < hsize; i++);
        hsize = 1 << i;
        hmask = hsize - 1;