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>

diff --git a/dir.c b/dir.c
index 390367fa6703624e4566006f647b875f96764ba8..059ec28dbbf25fd845bbeccb7e7852b5500036aa 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -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(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);
 }
 
                add_excludes_from_file(dir, excludes_file);
 }
 

diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh
index 1569596ab3beee2cecb14349f7676faa4c6ee02e..94bb696ff4514c38686bdc40bc6de37079027649 100755 (executable)
--- 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_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 &&
 
 test_expect_success 'Checking attributes in the XDG attributes file' '
        echo foo >f &&