Merge branch 'kb/status-ignored-optim-2'
commit3684101a654d5a7b598d9810df3b498f2a8928d0
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 19:58:56 +0000 (3 12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 19:58:56 +0000 (3 12:58 -0700)
treed0b60e2ef0bc9279f77543cefe14688593b06f42
parent1fee89cedd3f797ae792379475fab3e4183de17e
parentc3c327deeaf018e727a27f5ae88e140ff7a48595
Merge branch 'kb/status-ignored-optim-2'

Fix 1.8.3 regressions in the .gitignore path exclusion logic.

* kb/status-ignored-optim-2:
  dir.c: fix ignore processing within not-ignored directories
dir.c
t/t3001-ls-files-others-exclude.sh