mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/more-git-var' into maint-2.42

Browse Source 
Fix-up for a topic that already has graduated.

* bc/more-git-var:
  var: avoid a segmentation fault when `HOME` is unset
This commit is contained in:
Junio C Hamano
2023-11-02 16:53:23 +09:00
parent 0510d06b56 256a94ef6c
commit 535b30eb58
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/var.c
View File

@ -66,7 +66,7 @@ static char *git_attr_val_system(int ident_flag UNUSED)
static char *git_attr_val_global(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) { if (file) {
normalize_path_copy(file, file); normalize_path_copy(file, file);
return file; return file;

9
t/t0007-git-var.sh
View File

@ -268,4 +268,13 @@ test_expect_success 'listing and asking for variables are exclusive' '
test_must_fail git var -l GIT_COMMITTER_IDENT 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 test_done