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 /cache.h | |
| parent | f2c0ca4fae299c2515c1554dbeec2080af5c6792 (diff) | |
| parent | 0f7fb21a7aec7ab8047536af018daa981b3b2676 (diff) | |
| download | git-d1dfc016d868322638c87a23a624651874a107c2.tar.gz git-d1dfc016d868322638c87a23a624651874a107c2.tar.xz | |
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 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -644,6 +644,7 @@ int set_shared_perm(const char *path, int mode); #define adjust_shared_perm(path) set_shared_perm((path), 0) int safe_create_leading_directories(char *path); int safe_create_leading_directories_const(const char *path); +extern char *expand_user_path(const char *path); char *enter_repo(char *path, int strict); static inline int is_absolute_path(const char *path) { @@ -902,6 +903,7 @@ extern unsigned long git_config_ulong(const char *, const char *); extern int git_config_bool_or_int(const char *, const char *, int *); extern int git_config_bool(const char *, const char *); extern int git_config_string(const char **, const char *, const char *); +extern int git_config_pathname(const char **, const char *, const char *); extern int git_config_set(const char *, const char *); extern int git_config_set_multivar(const char *, const char *, const char *, int); extern int git_config_rename_section(const char *, const char *); |