diff options
author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2012-07-24 16:26:51 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-24 19:59:07 +0400 |
commit | 6283a376c47e7ca3327e563143c1ceda39ae25ac (patch) | |
tree | 85ed93767ccc872c1e1fbc45d258478d77ea78ec | |
parent | f0c1c15c41bdcdaf71c69355ac83789466820879 (diff) |
ignore: make sure we have an xdg path before using it
Commit e3ebc35 (config: fix several access(NULL) calls, 2012-07-12) was
fixing access(NULL) calls when trying to access $HOME/.config/git/config,
but missed the ones when trying to access $HOME/.config/git/ignore. Fix
and test this.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | dir.c | 2 | ||||
-rwxr-xr-x | t/t1306-xdg-files.sh | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -1302,7 +1302,7 @@ void setup_standard_excludes(struct dir_struct *dir) } if (!access(path, R_OK)) add_excludes_from_file(dir, path); - if (!access(excludes_file, R_OK)) + if (excludes_file && !access(excludes_file, R_OK)) add_excludes_from_file(dir, excludes_file); } diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh index 1569596ab3..94bb696ff4 100755 --- a/t/t1306-xdg-files.sh +++ b/t/t1306-xdg-files.sh @@ -95,6 +95,13 @@ test_expect_success 'Exclusion in a non-XDG global ignore file' ' test_must_fail git add to_be_excluded ' +test_expect_success 'Checking XDG ignore file when HOME is unset' ' + >expected && + (sane_unset HOME && + git config --unset core.excludesfile && + git ls-files --exclude-standard --ignored >actual) && + test_cmp expected actual +' test_expect_success 'Checking attributes in the XDG attributes file' ' echo foo >f && |