From: Jeff King <peff@peff.net>
Date: Thu, 21 May 2015 04:45:23 +0000 (-0400)
Subject: remote.c: hoist read_config into remote_get_1
X-Git-Tag: v2.5.0-rc0~55^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8770e6fbb28dffdf9e00d05365120e438d3d236f;p=thirdparty%2Fgit.git

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

diff --git a/remote.c b/remote.c
index a91d06396e..e6b29b34b6 100644
--- a/remote.c
+++ b/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);
 }