summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-02 20:23:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-02 20:23:20 (GMT)
commit1d8a6f6929054919baf4032e22935523c2843f2c (patch)
tree676ad7699612e6f200bad9647b15a07983b95247 /path.c
parentc518279c0efbee88c31bb9916572ddfd9ac8eb00 (diff)
parent8b27ff7eacc3bafcb12afcd6bbc99cdb8d718a26 (diff)
downloadgit-1d8a6f6929054919baf4032e22935523c2843f2c.zip
git-1d8a6f6929054919baf4032e22935523c2843f2c.tar.gz
git-1d8a6f6929054919baf4032e22935523c2843f2c.tar.bz2
Merge branch 'mm/config-edit-global'
Start "git config --edit --global" from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any. This immediately reduces the need for a later "Have you forgotten setting core.user?" and we can add more to the template as we gain more experience. * mm/config-edit-global: commit: advertise config --global --edit on guessed identity home_config_paths(): let the caller ignore xdg path config --global --edit: create a template file if needed
Diffstat (limited to 'path.c')
-rw-r--r--path.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/path.c b/path.c
index 3afcdb4..f68df0c 100644
--- a/path.c
+++ b/path.c
@@ -148,10 +148,12 @@ void home_config_paths(char **global, char **xdg, char *file)
*global = mkpathdup("%s/.gitconfig", home);
}
- if (!xdg_home)
- *xdg = NULL;
- else
- *xdg = mkpathdup("%s/git/%s", xdg_home, file);
+ if (xdg) {
+ if (!xdg_home)
+ *xdg = NULL;
+ else
+ *xdg = mkpathdup("%s/git/%s", xdg_home, file);
+ }
free(to_free);
}