Re: [PATCH v3 10/20] path: convert do_git_path to take a 'struct repository'

From: Jonathan Tan <jonathantanmy@google.com>
Date: Jun 20, 2017, 22:23 UTC
Message-ID: <20170620152308.42984ee7@twelve2.svl.corp.google.com>
In-Reply-To: <20170620191951.84791-11-bmwill@google.com>

On Tue, 20 Jun 2017 12:19:41 -0700 Brandon Williams <bmwill@google.com> wrote:

Show 6 quoted lines

> +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?

Show 9 quoted lines

> +	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);
>  }