On Tue, 20 Jun 2017 12:19:41 -0700 Brandon Williams <bmwill@xxxxxxxxxx> wrote: > +static void do_git_path(const struct repository *repo, > + const struct worktree *wt, struct strbuf *buf, > const char *fmt, va_list args) > { > int gitdir_len; > - strbuf_addstr(buf, get_worktree_git_dir(wt)); With this change, the get_worktree_git_dir() function no longer seems to be used from outside - could it be marked static? > + strbuf_worktree_gitdir(buf, repo, wt); > if (buf->len && !is_dir_sep(buf->buf[buf->len - 1])) > strbuf_addch(buf, '/'); > gitdir_len = buf->len; > strbuf_vaddf(buf, fmt, args); > - adjust_git_path(buf, gitdir_len); > + adjust_git_path(repo, buf, gitdir_len); > strbuf_cleanup_path(buf); > }