diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:51:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:51:36 -0800 |
| commit | d1dfc016d868322638c87a23a624651874a107c2 (patch) | |
| tree | cc2a7e259b875f5c0e72ddd26c4a430ae2b8b008 /builtin-commit.c | |
| parent | f2c0ca4fae299c2515c1554dbeec2080af5c6792 (diff) | |
| parent | 0f7fb21a7aec7ab8047536af018daa981b3b2676 (diff) | |
| download | git-d1dfc016d868322638c87a23a624651874a107c2.tar.gz | |
Merge branch 'mm/config-pathname-tilde-expand' into maint
* mm/config-pathname-tilde-expand:
Documentation: avoid xmlto input error
expand_user_path: expand ~ to $HOME, not to the actual homedir.
Expand ~ and ~user in core.excludesfile, commit.template
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 200ffdaad4..2299dc75ce 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -954,7 +954,7 @@ static int git_commit_config(const char *k, const char *v, void *cb) struct wt_status *s = cb; if (!strcmp(k, "commit.template")) - return git_config_string(&template_file, k, v); + return git_config_pathname(&template_file, k, v); return git_status_config(k, v, s); } |