Merge branch 'ap/dateformat'

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 6c1db86e8056285cb25359d55f5ebf9dd0e6f489..171d449048d304b043ed33776fab4bf95434e30a 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -280,7 +280,8 @@ static void prune_cache(const char *prefix)
 
        if (pos < 0)
                pos = -pos-1;
-       active_cache += pos;
+       memmove(active_cache, active_cache + pos,
+               (active_nr - pos) * sizeof(struct cache_entry *));
        active_nr -= pos;
        first = 0;
        last = active_nr;