undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote.c: hoist read_config into remote_get_1

Browse Source 
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:
Jeff King 2015-05-21 00:45:23 -04:00 committed by Junio C Hamano
parent da66b2743c
commit 8770e6fbb2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
remote.c
View File

@ -718,6 +718,8 @@ static struct remote *remote_get_1(const char *name,
struct remote *ret; struct remote *ret;
int name_given = 0; int name_given = 0;
read_config();
if (name) if (name)
name_given = 1; name_given = 1;
else else
@ -741,13 +743,11 @@ static struct remote *remote_get_1(const char *name,
struct remote *remote_get(const char *name) struct remote *remote_get(const char *name)
{ {
read_config();
return remote_get_1(name, remote_for_branch); return remote_get_1(name, remote_for_branch);
} }
struct remote *pushremote_get(const char *name) struct remote *pushremote_get(const char *name)
{ {
read_config();
return remote_get_1(name, pushremote_for_branch); return remote_get_1(name, pushremote_for_branch);
} }