diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:19 -0700 |
commit | cd27bc7a0bdb7e62090c503b9e8ab4b4a6bb3d06 (patch) | |
tree | d056097ed72d93eedc487640b463bde3650cd9a3 /setup.c | |
parent | c772d1bcdc058d655e6cd3518440a721433cb511 (diff) | |
parent | 33ad9ddd0b5398063f0aabea639b5fe569f458ea (diff) | |
download | git-cd27bc7a0bdb7e62090c503b9e8ab4b4a6bb3d06.tar.gz |
Merge branch 'rs/strbuf-add-real-path' into maint
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
* rs/strbuf-add-real-path:
strbuf: add strbuf_add_real_path()
cocci: use ALLOC_ARRAY
Diffstat (limited to 'setup.c')
-rw-r--r-- | setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -254,7 +254,7 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir) if (!is_absolute_path(data.buf)) strbuf_addf(&path, "%s/", gitdir); strbuf_addbuf(&path, &data); - strbuf_addstr(sb, real_path(path.buf)); + strbuf_add_real_path(sb, path.buf); ret = 1; } else { strbuf_addstr(sb, gitdir); |