ignore: info/exclude should trump core.excludesfile
commit099d2d86a8e17218aca31bf7c4070a820baf4baa
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2015 21:31:49 +0000 (22 14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2015 21:31:49 +0000 (22 14:31 -0700)
tree96b4b0c430ae0f48cca75ea85a192e7c1db36125
parent3d8a54eb37d298c251c0b6823dc06935a611bc33
ignore: info/exclude should trump core.excludesfile

$GIT_DIR/info/exclude and core.excludesfile (which falls back to
$XDG_HOME/git/ignore) are both ways to override the ignore pattern
lists given by the project in .gitignore files.  The former, which
is per-repository personal preference, should take precedence over
the latter, which is a personal preference default across different
repositories that are accessed from that machine.  The existing
documentation also agrees.

However, the precedence order was screwed up between these two from
the very beginning when 896bdfa2 (add: Support specifying an
excludes file with a configuration variable, 2007-02-27) introduced
core.excludesfile variable.

Noticed-by: Yohei Endo <yoheie@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
dir.c
t/t0008-ignores.sh