diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 23:01:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 23:01:25 +0100 |
| commit | bfef492d769cbea25c3cd951fe452be85402b160 (patch) | |
| tree | 24ef7ae95a661de168165b7927df4b2bf1ceba54 /path.c | |
| parent | Merge branch 'ds/rev-parse-required-args' (diff) | |
| parent | handle_path_include: don't look at NULL value (diff) | |
| download | git-bfef492d769cbea25c3cd951fe452be85402b160.tar.xz git-bfef492d769cbea25c3cd951fe452be85402b160.zip | |
Merge branch 'jk/config-path-include-fix'
include.path variable (or any variable that expects a path that can
use ~username expansion) in the configuration file is not a
boolean, but the code failed to check it.
* jk/config-path-include-fix:
handle_path_include: don't look at NULL value
expand_user_path: do not look at NULL path
Diffstat (limited to 'path.c')
| -rw-r--r-- | path.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -265,12 +265,12 @@ static struct passwd *getpw_str(const char *username, size_t len) char *expand_user_path(const char *path) { struct strbuf user_path = STRBUF_INIT; - const char *first_slash = strchrnul(path, '/'); const char *to_copy = path; if (path == NULL) goto return_null; if (path[0] == '~') { + const char *first_slash = strchrnul(path, '/'); const char *username = path + 1; size_t username_len = first_slash - username; if (username_len == 0) { |