From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Eric Sunshine <sunshine@sunshineco.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push
Date: Wed, 20 Mar 2013 18:14:59 +0530 [thread overview]
Message-ID: <1363783501-27981-5-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1363783501-27981-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 | 25 +++++++++++++++++++++----
remote.h | 1 +
3 files changed, 23 insertions(+), 5 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..cf7a65d 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,17 +670,21 @@ 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, const char *pushremote_name)
{
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;
+ if (pushremote_name) {
+ name = pushremote_name;
+ name_given = 1;
+ } else {
+ name = default_remote_name;
+ name_given = explicit_default_remote_name;
+ }
}
ret = make_remote(name, 0);
@@ -698,6 +703,18 @@ struct remote *remote_get(const char *name)
return ret;
}
+struct remote *remote_get(const char *name)
+{
+ read_config();
+ return remote_get_1(name, NULL);
+}
+
+struct remote *pushremote_get(const char *name)
+{
+ read_config();
+ return remote_get_1(name, pushremote_name);
+}
+
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
next prev parent reply other threads:[~2013-03-20 12:44 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 12:44 [PATCH v2 0/6] Support triangular workflows Ramkumar Ramachandra
2013-03-20 12:44 ` [PATCH 1/6] remote.c: simplify a bit of code using git_config_string() Ramkumar Ramachandra
2013-03-20 18:07 ` Jonathan Nieder
2013-03-20 18:12 ` Ramkumar Ramachandra
2013-03-20 12:44 ` [PATCH 2/6] t5516 (fetch-push): update test description Ramkumar Ramachandra
2013-03-20 18:22 ` Jonathan Nieder
2013-03-20 18:33 ` Ramkumar Ramachandra
2013-03-20 18:35 ` Jonathan Nieder
2013-03-20 12:44 ` [PATCH 3/6] t5516 (fetch-push): introduce mk_test_with_name() Ramkumar Ramachandra
2013-03-20 18:28 ` Jonathan Nieder
2013-03-20 18:38 ` Ramkumar Ramachandra
2013-03-20 18:41 ` Jonathan Nieder
2013-03-20 18:58 ` Jeff King
2013-03-20 19:52 ` Junio C Hamano
2013-03-20 20:00 ` Jonathan Nieder
2013-03-20 12:44 ` Ramkumar Ramachandra [this message]
2013-03-20 18:30 ` [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push Jonathan Nieder
2013-03-20 19:03 ` Junio C Hamano
2013-03-20 19:43 ` Ramkumar Ramachandra
2013-03-20 19:48 ` Junio C Hamano
2013-03-20 12:45 ` [PATCH 5/6] remote.c: introduce remote.pushdefault Ramkumar Ramachandra
2013-03-20 18:32 ` Jonathan Nieder
2013-03-20 18:53 ` Junio C Hamano
2013-03-20 19:46 ` Ramkumar Ramachandra
2013-03-20 12:45 ` [PATCH 6/6] remote.c: introduce branch.<name>.pushremote Ramkumar Ramachandra
2013-03-20 13:03 ` Tay Ray Chuan
2013-03-20 13:35 ` Ramkumar Ramachandra
2013-03-20 13:06 ` [PATCH v2 0/6] Support triangular workflows Tay Ray Chuan
2013-03-22 7:44 ` Ramkumar Ramachandra
2013-03-20 23:04 ` Philip Oakley
2013-03-22 7:41 ` Ramkumar Ramachandra
2013-03-22 15:16 ` Junio C Hamano
2013-03-23 12:42 ` Ramkumar Ramachandra
2013-03-22 7:52 [PATCH v3 " Ramkumar Ramachandra
2013-03-22 7:52 ` [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push Ramkumar Ramachandra
2013-03-22 21:21 ` Jonathan Nieder
2013-03-22 22:13 ` Junio C Hamano
2013-03-22 23:41 ` Jonathan Nieder
2013-03-23 13:18 ` Ramkumar Ramachandra
2013-03-23 12:57 ` Ramkumar Ramachandra
2013-03-28 13:26 [PATCH v4 0/6] Support triangular workflows Ramkumar Ramachandra
2013-03-28 13:26 ` [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push Ramkumar Ramachandra
2013-04-02 7:40 [PATCH 0/6] Re-roll rr/triangle Ramkumar Ramachandra
2013-04-02 7:40 ` [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363783501-27981-5-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).