Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

diff --git a/read-cache.c b/read-cache.c
index 7b1be1b6712cdd09f4c341c9d75cfd0ed6c3aa37..93a897f240696c82d45e4189266fe187c58f0b1b 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -549,7 +549,7 @@ static int index_name_stage_pos(const struct index_state *istate, const char *na
        first = 0;
        last = istate->cache_nr;
        while (last > first) {
-               int next = (last + first) >> 1;
+               int next = first + ((last - first) >> 1);
                struct cache_entry *ce = istate->cache[next];
                int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
                if (!cmp)