diff options
| -rw-r--r-- | builtin/var.c | 2 | ||||
| -rwxr-xr-x | t/t0007-git-var.sh | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/builtin/var.c b/builtin/var.c index ef45710a20..05ba69e47b 100644 --- a/builtin/var.c +++ b/builtin/var.c @@ -64,7 +64,7 @@ static char *git_attr_val_system(int ident_flag UNUSED) static char *git_attr_val_global(int ident_flag UNUSED) { - char *file = xstrdup(git_attr_global_file()); + char *file = xstrdup_or_null(git_attr_global_file()); if (file) { normalize_path_copy(file, file); return file; diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh index 8cb597f99c..ff4fd9348c 100755 --- a/t/t0007-git-var.sh +++ b/t/t0007-git-var.sh @@ -268,4 +268,13 @@ test_expect_success 'listing and asking for variables are exclusive' ' test_must_fail git var -l GIT_COMMITTER_IDENT ' +test_expect_success '`git var -l` works even without HOME' ' + ( + XDG_CONFIG_HOME= && + export XDG_CONFIG_HOME && + unset HOME && + git var -l + ) +' + test_done |