From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:33:56 +0000 (-0800)
Subject: Merge branch 'rs/check-ignore-multi'
X-Git-Tag: v2.17.0-rc0~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=796a788a1c1a2f6a93763312a840d7ed67a8e32f;p=git

Merge branch 'rs/check-ignore-multi'

"git check-ignore" with multiple paths got confused when one is a
file and the other is a directory, which has been fixed.

* rs/check-ignore-multi:
  check-ignore: fix mix of directories and other file types
---

796a788a1c1a2f6a93763312a840d7ed67a8e32f