From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v2 16/21] refs: check submodules ref storage config
Date: Mon, 11 Jan 2016 20:22:15 -0500 [thread overview]
Message-ID: <1452561740-8668-17-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1452561740-8668-1-git-send-email-dturner@twopensource.com>
All submodules must have the same ref storage (for now). Confirm that
this is so before attempting to do anything with submodule refs.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/refs.c b/refs.c
index 07f1dab..1ccc7f6 100644
--- a/refs.c
+++ b/refs.c
@@ -297,8 +297,43 @@ int for_each_tag_ref(each_ref_fn fn, void *cb_data)
return for_each_ref_in("refs/tags/", fn, cb_data);
}
+static int submodule_backend(const char *key, const char *value, void *data)
+{
+ char **path = data;
+ if (!strcmp(key, "extensions.refstorage"))
+ *path = xstrdup(value);
+}
+
+static void check_submodule_backend(const char *submodule)
+{
+ struct strbuf sb = STRBUF_INIT;
+ char *submodule_storage_backend = xstrdup("files");
+
+ if (!submodule)
+ goto done;
+
+ strbuf_git_path_submodule(&sb, submodule, "%s", "");
+
+ if (!is_git_directory(sb.buf))
+ goto done;
+
+ strbuf_reset(&sb);
+ strbuf_git_path_submodule(&sb, submodule, "config");
+
+ git_config_from_file(submodule_backend, sb.buf,
+ &submodule_storage_backend);
+ if (strcmp(submodule_storage_backend, ref_storage_backend))
+ die("Ref storage '%s' for submodule '%s' does not match our storage, '%s'",
+ submodule_storage_backend, submodule, ref_storage_backend);
+
+done:
+ free(submodule_storage_backend);
+ strbuf_release(&sb);
+}
+
int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return for_each_ref_in_submodule(submodule, "refs/tags/", fn, cb_data);
}
@@ -309,6 +344,7 @@ int for_each_branch_ref(each_ref_fn fn, void *cb_data)
int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return for_each_ref_in_submodule(submodule, "refs/heads/", fn, cb_data);
}
@@ -319,6 +355,7 @@ int for_each_remote_ref(each_ref_fn fn, void *cb_data)
int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return for_each_ref_in_submodule(submodule, "refs/remotes/", fn, cb_data);
}
@@ -1369,6 +1406,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
int resolve_gitlink_ref(const char *path, const char *refname,
unsigned char *sha1)
{
+ check_submodule_backend(path);
return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
}
@@ -1379,6 +1417,7 @@ int head_ref(each_ref_fn fn, void *cb_data)
int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return the_refs_backend->head_ref_submodule(submodule, fn, cb_data);
}
@@ -1389,6 +1428,7 @@ int for_each_ref(each_ref_fn fn, void *cb_data)
int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return the_refs_backend->for_each_ref_submodule(submodule, fn, cb_data);
}
@@ -1407,6 +1447,7 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
int for_each_ref_in_submodule(const char *submodule, const char *prefix,
each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return the_refs_backend->for_each_ref_in_submodule(submodule, prefix,
fn, cb_data);
}
--
2.4.2.749.g730654d-twtrsrc
next prev parent reply other threads:[~2016-01-12 1:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 1:21 [PATCH v2 00/21] refs backend reroll David Turner
2016-01-12 1:22 ` [PATCH v2 01/21] refs: add a backend method structure with transaction functions David Turner
2016-01-12 1:22 ` [PATCH v2 02/21] refs: add methods for misc ref operations David Turner
2016-01-12 1:22 ` [PATCH v2 03/21] refs: add methods for the ref iterators David Turner
2016-01-12 1:22 ` [PATCH v2 04/21] refs: add do_for_each_per_worktree_ref David Turner
2016-01-12 1:22 ` [PATCH v2 05/21] refs: add methods for reflog David Turner
2016-01-12 1:22 ` [PATCH v2 06/21] refs: add method for initial ref transaction commit David Turner
2016-01-12 1:22 ` [PATCH v2 07/21] refs: add method for delete_refs David Turner
2016-01-12 1:22 ` [PATCH v2 08/21] refs: add methods to init refs db David Turner
2016-01-12 1:22 ` [PATCH v2 09/21] refs: add method to rename refs David Turner
2016-01-12 1:22 ` [PATCH v2 10/21] refs: make lock generic David Turner
2016-01-12 1:22 ` [PATCH v2 11/21] refs: move duplicate check to common code David Turner
2016-01-12 1:22 ` [PATCH v2 12/21] refs: allow log-only updates David Turner
2016-01-12 1:22 ` [PATCH v2 13/21] refs: resolve symbolic refs first David Turner
2016-01-13 0:19 ` Junio C Hamano
2016-01-13 16:33 ` David Turner
2016-01-12 1:22 ` [PATCH v2 14/21] refs: always handle non-normal refs in files backend David Turner
2016-01-13 0:19 ` Junio C Hamano
2016-01-13 16:34 ` David Turner
2016-01-12 1:22 ` [PATCH v2 15/21] init: allow alternate backends to be set for new repos David Turner
2016-01-12 1:22 ` David Turner [this message]
2016-01-13 0:19 ` [PATCH v2 16/21] refs: check submodules ref storage config Junio C Hamano
2016-01-13 16:32 ` David Turner
2016-01-13 17:02 ` Junio C Hamano
2016-01-12 1:22 ` [PATCH v2 17/21] clone: use child_process for recursive checkouts David Turner
2016-01-12 1:22 ` [PATCH v2 18/21] refs: allow ref backend to be set for clone David Turner
2016-01-12 1:22 ` [PATCH v2 19/21] svn: learn ref-storage argument David Turner
2016-01-12 1:22 ` [PATCH v2 20/21] refs: add LMDB refs backend David Turner
2016-01-14 20:52 ` Jeff King
2016-01-14 22:30 ` David Turner
2016-01-12 1:22 ` [PATCH v2 21/21] refs: tests for lmdb backend David Turner
2016-01-13 0:22 ` [PATCH v2 00/21] refs backend reroll Junio C Hamano
2016-01-14 9:26 ` Jeff King
2016-01-14 16:25 ` David Turner
2016-01-14 20:12 ` Jeff King
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=1452561740-8668-17-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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).