remote.c: hoist read_config into remote_get_1
Before the previous commit, we had to make sure that read_config() was called before entering remote_get_1, because we needed to pass pushremote_name by value. But now that we pass a function, we can let remote_get_1 handle loading the config itself, turning our wrappers into true one-liners. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
da66b2743c
commit
8770e6fbb2
4
remote.c
4
remote.c
@ -718,6 +718,8 @@ static struct remote *remote_get_1(const char *name,
|
||||
struct remote *ret;
|
||||
int name_given = 0;
|
||||
|
||||
read_config();
|
||||
|
||||
if (name)
|
||||
name_given = 1;
|
||||
else
|
||||
@ -741,13 +743,11 @@ static struct remote *remote_get_1(const char *name,
|
||||
|
||||
struct remote *remote_get(const char *name)
|
||||
{
|
||||
read_config();
|
||||
return remote_get_1(name, remote_for_branch);
|
||||
}
|
||||
|
||||
struct remote *pushremote_get(const char *name)
|
||||
{
|
||||
read_config();
|
||||
return remote_get_1(name, pushremote_for_branch);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user