[PATCH 2/4] remote.c: introduce a way to have different remotes for fetch/ push
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Mar 18, 2013, 13:16 UTC
- Message-ID
- <1363612575-7340-3-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1363612575-7340-1-git-send-email-artagnon@gmail.com>
Currently, do_push() in push.c calls remote_get(), which gets the configured remote for fetching and pushing. Replace this call with a call to pushremote_get() instead, a new function that will return the remote configured specifically for pushing. This function tries to work with the string pushremote_name, before falling back to the codepath of remote_get(). This patch has no visible impact, but serves to enable future patches to introduce configuration variables to set this variable.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> --- builtin/push.c | 2 +- remote.c | 49 ++++++++++++++++++++++++++++++++++++------------- remote.h | 1 + 3 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c index 42b129d..d447a80 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -322,7 +322,7 @@ static int push_with_options(struct transport *transport, int flags) static int do_push(const char *repo, int flags) { int i, errs; - struct remote *remote = remote_get(repo); + struct remote *remote = pushremote_get(repo); const char **url; int url_nr; diff --git a/remote.c b/remote.c index 45b69d6..4704404 100644 --- a/remote.c +++ b/remote.c @@ -48,6 +48,7 @@ static int branches_nr; static struct branch *current_branch; static const char *default_remote_name; +static const char *pushremote_name; static int explicit_default_remote_name; static struct rewrites rewrites; @@ -669,20 +670,9 @@ static int valid_remote_nick(const char *name) return !strchr(name, '/'); /* no slash */ } -struct remote *remote_get(const char *name) +static struct remote *remote_get_1(const char *name, int name_given) { - struct remote *ret; - int name_given = 0; - - read_config(); - if (name) - name_given = 1; - else { - name = default_remote_name; - name_given = explicit_default_remote_name; - } - - ret = make_remote(name, 0); + struct remote *ret = make_remote(name, 0); if (valid_remote_nick(name)) { if (!valid_remote(ret)) read_remotes_file(ret); @@ -698,6 +688,39 @@ struct remote *remote_get(const char *name) return ret; } +struct remote *remote_get(const char *name) +{ + int name_given = 0; + + read_config(); + if (name) + name_given = 1; + else { + name = default_remote_name; + name_given = explicit_default_remote_name; + } + return remote_get_1(name, name_given); +} + +struct remote *pushremote_get(const char *name) +{ + int name_given = 0; + + read_config(); + if (name) + name_given = 1; + else { + if (pushremote_name) { + name = pushremote_name; + name_given = 1; + } else { + name = default_remote_name; + name_given = explicit_default_remote_name; + } + } + return remote_get_1(name, name_given); +} + int remote_is_configured(const char *name) { int i; diff --git a/remote.h b/remote.h index 251d8fd..99a437f 100644 --- a/remote.h +++ b/remote.h @@ -51,6 +51,7 @@ struct remote { }; struct remote *remote_get(const char *name); +struct remote *pushremote_get(const char *name); int remote_is_configured(const char *name); typedef int each_remote_fn(struct remote *remote, void *priv);
-- 1.8.2