mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ds/disable-replace-refs' into next

Browse Source 
Introduce a mechanism to disable replace refs globally and per
repository.

* ds/disable-replace-refs:
  repository: create read_replace_refs setting
  replace-objects: create wrapper around setting
  repository: create disable_replace_refs()
  pack-bitmap.c: use commit boundary during bitmap traversal
  pack-bitmap.c: extract `fill_in_bitmap()`
  object: add object_array initializer helper function
This commit is contained in:
Junio C Hamano
2023-06-15 14:04:54 -07:00
parent 6ff4a2b913 9c7d1b057f
commit e7baddb745
28 changed files with 395 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
replace-object.c
View File

@ -64,7 +64,7 @@ void prepare_replace_object(struct repository *r)
* replacement object's name (replaced recursively, if necessary).
* The return value is either oid or a pointer to a
* permanently-allocated value. This function always respects replace
* references, regardless of the value of read_replace_refs.
* references, regardless of the value of r->settings.read_replace_refs.
*/
const struct object_id *do_lookup_replace_object(struct repository *r,
const struct object_id *oid)
@ -84,3 +84,29 @@ const struct object_id *do_lookup_replace_object(struct repository *r,
}
die(_("replace depth too high for object %s"), oid_to_hex(oid));
}
/*
* This indicator determines whether replace references should be
* respected process-wide, regardless of which repository is being
* using at the time.
*/
static int read_replace_refs = 1;
void disable_replace_refs(void)
{
read_replace_refs = 0;
}
int replace_refs_enabled(struct repository *r)
{
if (!read_replace_refs)
return 0;
if (r->gitdir) {
prepare_repo_settings(r);
return r->settings.read_replace_refs;
}
/* repository has no objects or refs. */
return 0;
}