Merge branch 'kb/status-ignored-optim-2' into maint
commitfd500302096b5b4e45d78c14d6ea9a704f556a16
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jun 2013 00:05:15 +0000 (9 17:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jun 2013 00:05:15 +0000 (9 17:05 -0700)
tree8b4d7091d3e78f597d0845711a7401986e912982
parent467b8fe1bb900832f51281fe954d9134b545d6dd
parentc3c327deeaf018e727a27f5ae88e140ff7a48595
Merge branch 'kb/status-ignored-optim-2' into maint

Fix recent regression of .gitignore files that list !directory to
mark it not-ignored.

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