Nguyễn Thái Ngọc Duyadd_submodule_odb() can be used to import objects from another repository temporarily. After this point we don't know which objects are ours, which are external. If we create an object that refers to an external object, next time git runs, it may find a hole in the object graph because the external repository may not be imported. The same goes for pointing a ref to an external SHA-1.
To protect ourselves, once add_submodule_odb() is used:
- trees, tags and commits cannot be created - refs cannot be updated
In certain cases that submodule code knows that it's safe to write, it can turn the readonly flag off.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- I think this is a good safety check. It catches at least a case in t7405.3. I did not investigate further though.
cache.h | 1 + refs.c | 2 ++ sha1_file.c | 2 ++ submodule.c | 7 +++++++ 5 files changed, 16 insertions(+)
Show changes to 4 files +12 −0
cache.h, refs.c, sha1_file.c, submodule.c
diff --git a/cache.h b/cache.h index c257953..772d229 100644 --- a/cache.h +++ b/cache.h @@ -753,6 +753,7 @@ extern int force_object_loose(const unsigned char *sha1, time_t mtime); extern void *map_sha1_file(const unsigned char *sha1, unsigned long *size); extern int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz); extern int parse_sha1_header(const char *hdr, unsigned long *sizep); +extern int git_repo_readonly(); /* global flag to enable extra checks when accessing packed objects */ extern int do_check_packed_object_crc; diff --git a/refs.c b/refs.c index 541fec2..22b13f4 100644 --- a/refs.c +++ b/refs.c @@ -1711,6 +1711,8 @@ struct ref_lock *lock_ref_sha1(const char *refname, const unsigned char *old_sha struct ref_lock *lock_any_ref_for_update(const char *refname, const unsigned char *old_sha1, int flags) { + if (git_repo_readonly()) + die("repository in read-only mode, cannot update refs"); if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) return NULL; return lock_ref_sha1_basic(refname, old_sha1, flags, NULL); diff --git a/sha1_file.c b/sha1_file.c index 40b2329..b9e8b59 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2575,6 +2575,8 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign char hdr[32]; int hdrlen; + if (git_repo_readonly() && strcmp(type, "blob")) + die("repository in read-only mode, cannot update object database"); /* Normally if we have it in the pack then we do not bother writing * it out into .git/objects/??/?{38} file. */ diff --git a/submodule.c b/submodule.c index 2f55436..5eba597 100644 --- a/submodule.c +++ b/submodule.c @@ -19,6 +19,7 @@ static struct string_list changed_submodule_paths; static int initialized_fetch_ref_tips; static struct sha1_array ref_tips_before_fetch; static struct sha1_array ref_tips_after_fetch; +static int readonly; /* * The following flag is set if the .gitmodules file is unmerged. We then @@ -30,6 +31,11 @@ static struct sha1_array ref_tips_after_fetch; */ static int gitmodules_is_unmerged; +int git_repo_readonly() +{ + return readonly; +} + static int add_submodule_odb(const char *path) { struct strbuf objects_directory = STRBUF_INIT; @@ -67,6 +73,7 @@ static int add_submodule_odb(const char *path) /* add possible alternates from the submodule */ read_info_alternates(objects_directory.buf, 0); prepare_alt_odb(); + readonly = 1; done: strbuf_release(&objects_directory); return ret;
-- 1.8.0.rc2.23.g1fb49df
