mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serve: use repository pointer to get config

Browse Source 
A few of the v2 "serve" callbacks ignore their repository parameter and
read config using the_repository (either directly or implicitly by
calling wrapper functions). This isn't a bug since the server code only
handles a single main repository anyway (and indeed, if you look at the
callers, these repository parameters will always be the_repository). But
in the long run we want to get rid of the_repository, so let's take a
tiny step in that direction.

As a bonus, this silences some -Wunused-parameter warnings.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-02-24 01:38:10 -05:00
committed by Junio C Hamano
parent c4716086d8
commit 4b4e75dd4f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ls-refs.c
View File

@ -12,11 +12,11 @@ static enum {
UNBORN_IGNORE = 0,
UNBORN_ALLOW,
UNBORN_ADVERTISE /* implies ALLOW */
} unborn_config(void)
} unborn_config(struct repository *r)
{
const char *str = NULL;
if (repo_config_get_string_tmp(the_repository, "lsrefs.unborn", &str)) {
if (repo_config_get_string_tmp(r, "lsrefs.unborn", &str)) {
/*
* If there is no such config, advertise and allow it by
* default.
@ -168,7 +168,7 @@ int ls_refs(struct repository *r, struct packet_reader *request)
strvec_push(&data.prefixes, out);
}
else if (!strcmp("unborn", arg))
data.unborn = !!unborn_config();
data.unborn = !!unborn_config(r);
else
die(_("unexpected line: '%s'"), arg);
}
@ -199,7 +199,7 @@ int ls_refs(struct repository *r, struct packet_reader *request)
int ls_refs_advertise(struct repository *r, struct strbuf *value)
{
if (value && unborn_config() == UNBORN_ADVERTISE)
if (value && unborn_config(r) == UNBORN_ADVERTISE)
strbuf_addstr(value, "unborn");
return 1;