Merge branch 'ds/include-exclude'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 5acc39694984ab638396e778ac06cbe61a9c704f..f069a028cea1afa09edda8d039437fe39d9585ac 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -373,7 +373,7 @@ static void prune_index(struct index_state *istate,
        first = pos;
        last = istate->cache_nr;
        while (last > first) {
-               int next = (last + first) >> 1;
+               int next = first + ((last - first) >> 1);
                const struct cache_entry *ce = istate->cache[next];
                if (!strncmp(ce->name, prefix, prefixlen)) {
                        first = next+1;