rebase -p: fix quoting when calling `git merge`

diff --git a/cache-tree.c b/cache-tree.c
index 71d092ed514549f03407aef4fd17ab1467191c68..d3f7401278bd5130558dde18da1235c188bb7303 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -49,7 +49,7 @@ static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
        lo = 0;
        hi = it->subtree_nr;
        while (lo < hi) {
-               int mi = (lo + hi) / 2;
+               int mi = lo + (hi - lo) / 2;
                struct cache_tree_sub *mdl = down[mi];
                int cmp = subtree_name_cmp(path, pathlen,
                                           mdl->name, mdl->namelen);