Merge branch 'ds/add-rm-with-sparse-index'

Regression fix.

* ds/add-rm-with-sparse-index:
  dir: fix directory-matching bug

diff --cc dir.c
Simple merge

diff --cc t/t0008-ignores.sh
Simple merge