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

Regression fix for 2.34

* ds/add-rm-with-sparse-index:
  dir: revert "dir: select directories correctly"

diff --cc dir.c
Simple merge

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