From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jun 2013 00:05:15 +0000 (-0700)
Subject: Merge branch 'kb/status-ignored-optim-2' into maint
X-Git-Tag: v1.8.3.1~3
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=fd500302096b5b4e45d78c14d6ea9a704f556a16;p=git.git

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
---

fd500302096b5b4e45d78c14d6ea9a704f556a16