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

1  2 
dir.c
t/t3001-ls-files-others-exclude.sh

diff --cc dir.c
Simple merge
Simple merge