path: convert strbuf_git_common_path to take a 'struct repository'
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7aee36013a
commit
b337172c83
13
path.c
13
path.c
@ -524,11 +524,12 @@ int strbuf_git_path_submodule(struct strbuf *buf, const char *path,
|
||||
return err;
|
||||
}
|
||||
|
||||
static void do_git_common_path(struct strbuf *buf,
|
||||
static void do_git_common_path(const struct repository *repo,
|
||||
struct strbuf *buf,
|
||||
const char *fmt,
|
||||
va_list args)
|
||||
{
|
||||
strbuf_addstr(buf, get_git_common_dir());
|
||||
strbuf_addstr(buf, repo->commondir);
|
||||
if (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))
|
||||
strbuf_addch(buf, '/');
|
||||
strbuf_vaddf(buf, fmt, args);
|
||||
@ -540,16 +541,18 @@ const char *git_common_path(const char *fmt, ...)
|
||||
struct strbuf *pathname = get_pathname();
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
do_git_common_path(pathname, fmt, args);
|
||||
do_git_common_path(the_repository, pathname, fmt, args);
|
||||
va_end(args);
|
||||
return pathname->buf;
|
||||
}
|
||||
|
||||
void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...)
|
||||
void strbuf_git_common_path(struct strbuf *sb,
|
||||
const struct repository *repo,
|
||||
const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
do_git_common_path(sb, fmt, args);
|
||||
do_git_common_path(repo, sb, fmt, args);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user