diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:13 -0700 |
| commit | e9f767ecee21af47fa5515ee6f8106d70cabe983 (patch) | |
| tree | e0bd4999a874729c219b405dad31e4f82454a062 /t | |
| parent | 2d8bb4685c4d1e7187f93436fc26ad468a0cf941 (diff) | |
| parent | 099d2d86a8e17218aca31bf7c4070a820baf4baa (diff) | |
| download | git-e9f767ecee21af47fa5515ee6f8106d70cabe983.tar.gz | |
Merge branch 'jc/gitignore-precedence' into maint
core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed
to be overridden by repository-specific .git/info/exclude file, but
the order was swapped from the beginning. This belatedly fixes it.
* jc/gitignore-precedence:
ignore: info/exclude should trump core.excludesfile
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0008-ignores.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 8dc6939b90..4ef5ed484c 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -831,4 +831,14 @@ test_expect_success !MINGW,!CYGWIN 'correct handling of backslashes' ' test_cmp err.expect err ' +test_expect_success 'info/exclude trumps core.excludesfile' ' + echo >>global-excludes usually-ignored && + echo >>.git/info/exclude "!usually-ignored" && + >usually-ignored && + echo "?? usually-ignored" >expect && + + git status --porcelain usually-ignored >actual && + test_cmp expect actual +' + test_done |