From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH v1 05/11] remote-odb: add remote_odb_reinit()
Date: Sat, 23 Jun 2018 14:18:42 +0200 [thread overview]
Message-ID: <20180623121846.19750-6-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20180623121846.19750-1-chriscool@tuxfamily.org>
We will need to reinitialize the remote odb configuration
as we will make some changes to it in a later commit when
we will detect that a remote is also a remote odb.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
remote-odb.c | 14 ++++++++++++--
remote-odb.h | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/remote-odb.c b/remote-odb.c
index cc7059b23a..2b93d13abd 100644
--- a/remote-odb.c
+++ b/remote-odb.c
@@ -39,17 +39,27 @@ static int remote_odb_config(const char *var, const char *value, void *data)
return 0;
}
-static void remote_odb_init(void)
+static void remote_odb_do_init(int force)
{
static int initialized;
- if (initialized)
+ if (!force && initialized)
return;
initialized = 1;
git_config(remote_odb_config, NULL);
}
+static inline void remote_odb_init(void)
+{
+ remote_odb_do_init(0);
+}
+
+inline void remote_odb_reinit(void)
+{
+ remote_odb_do_init(1);
+}
+
struct odb_helper *find_odb_helper(const char *remote)
{
struct odb_helper *o;
diff --git a/remote-odb.h b/remote-odb.h
index e10a8bf855..79803782af 100644
--- a/remote-odb.h
+++ b/remote-odb.h
@@ -1,6 +1,7 @@
#ifndef REMOTE_ODB_H
#define REMOTE_ODB_H
+extern void remote_odb_reinit(void);
extern struct odb_helper *find_odb_helper(const char *remote);
extern int has_remote_odb(void);
extern int remote_odb_get_direct(const unsigned char *sha1);
--
2.17.0.762.g886f54ea46
next prev parent reply other threads:[~2018-06-23 12:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-23 12:18 [PATCH v1 0/9] Introducing remote ODBs Christian Couder
2018-06-23 12:18 ` [PATCH v1 01/11] fetch-object: make functions return an error code Christian Couder
2018-06-23 12:18 ` [PATCH v1 02/11] Add initial remote odb support Christian Couder
2018-06-23 12:18 ` [PATCH v1 03/11] remote-odb: implement remote_odb_get_direct() Christian Couder
2018-06-23 12:18 ` [PATCH v1 04/11] remote-odb: implement remote_odb_get_many_direct() Christian Couder
2018-06-23 12:18 ` Christian Couder [this message]
2018-06-23 12:18 ` [PATCH v1 06/11] Use remote_odb_get_direct() and has_remote_odb() Christian Couder
2018-06-23 12:18 ` [PATCH v1 07/11] Use odb.origin.partialclonefilter instead of core.partialclonefilter Christian Couder
2018-06-23 12:18 ` [PATCH v1 08/11] t0410: test fetching from many promisor remotes Christian Couder
2018-06-23 12:18 ` [PATCH v1 09/11] Documentation/config: add odb.<name>.promisorRemote Christian Couder
2018-06-23 12:29 ` [PATCH v1 0/9] Introducing remote ODBs Christian Couder
2018-06-25 21:49 ` Junio C Hamano
2018-06-26 0:37 ` Eric Sunshine
2018-06-28 15:17 ` Christian Couder
2018-06-28 13:04 ` Christian Couder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180623121846.19750-6-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).