mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-13 08:57:56 -05:00
f3aeae983a
When `js/objects-larger-than-4gb-on-windows` widened the streaming, index-pack and unpack-objects code paths, in the interest of keeping the patches somewhat reasonably-sized, it left the public ODB API still typed in `unsigned long`. In particular `struct object_info::sizep` and the four wrappers built on top of it (`odb_read_object`, `odb_read_object_peeled`, `odb_read_object_info`, `odb_pretend_object`) still return the unpacked size through `unsigned long *`, so on Windows `cat-file -s` and the `git add` / `git status` paths for a >4 GiB blob silently cap at 4 GiB. Widen the field and the four wrappers. The previous commits already widened the `unpack_entry()` cascade and pack-objects' in-core size accessors, so most of the cascade arrives here with no further work: the temporary shims in `packed_object_info_with_index_pos()` and in `unpack_entry()`'s delta-base recovery path go away, the two `SET_SIZE(entry, cast_size_t_to_ulong(canonical_size))` calls in `check_object()` and the matching one in `drop_reused_delta()` collapse to plain `SET_SIZE`, and `oe_get_size_slow()`'s tail `cast_size_t_to_ulong()` is gone too. What remains narrow are the boundaries this series does not intend to touch: the diff, blame, textconv and fast-import machinery. Even so, this patch is unfortunately quite large. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
106 lines
2.5 KiB
C
106 lines
2.5 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "git-compat-util.h"
|
|
#include "notes-cache.h"
|
|
#include "object-file.h"
|
|
#include "odb.h"
|
|
#include "pretty.h"
|
|
#include "repository.h"
|
|
#include "commit.h"
|
|
#include "refs.h"
|
|
#include "strbuf.h"
|
|
|
|
static int notes_cache_match_validity(struct repository *r,
|
|
const char *ref,
|
|
const char *validity)
|
|
{
|
|
struct object_id oid;
|
|
struct commit *commit;
|
|
struct pretty_print_context pretty_ctx;
|
|
struct strbuf msg = STRBUF_INIT;
|
|
int ret;
|
|
|
|
if (refs_read_ref(get_main_ref_store(the_repository), ref, &oid) < 0)
|
|
return 0;
|
|
|
|
commit = lookup_commit_reference_gently(r, &oid, 1);
|
|
if (!commit)
|
|
return 0;
|
|
|
|
memset(&pretty_ctx, 0, sizeof(pretty_ctx));
|
|
repo_format_commit_message(r, commit, "%s", &msg,
|
|
&pretty_ctx);
|
|
strbuf_trim(&msg);
|
|
|
|
ret = !strcmp(msg.buf, validity);
|
|
strbuf_release(&msg);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void notes_cache_init(struct repository *r, struct notes_cache *c,
|
|
const char *name, const char *validity)
|
|
{
|
|
struct strbuf ref = STRBUF_INIT;
|
|
int flags = NOTES_INIT_WRITABLE;
|
|
|
|
memset(c, 0, sizeof(*c));
|
|
c->validity = xstrdup(validity);
|
|
|
|
strbuf_addf(&ref, "refs/notes/%s", name);
|
|
if (!notes_cache_match_validity(r, ref.buf, validity))
|
|
flags |= NOTES_INIT_EMPTY;
|
|
init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
|
|
strbuf_release(&ref);
|
|
}
|
|
|
|
int notes_cache_write(struct notes_cache *c)
|
|
{
|
|
struct object_id tree_oid, commit_oid;
|
|
|
|
if (!c || !c->tree.initialized || !c->tree.update_ref ||
|
|
!*c->tree.update_ref)
|
|
return -1;
|
|
if (!c->tree.dirty)
|
|
return 0;
|
|
|
|
if (write_notes_tree(&c->tree, &tree_oid))
|
|
return -1;
|
|
if (commit_tree(c->validity, strlen(c->validity), &tree_oid, NULL,
|
|
&commit_oid, NULL, NULL) < 0)
|
|
return -1;
|
|
if (refs_update_ref(get_main_ref_store(the_repository), "update notes cache", c->tree.update_ref, &commit_oid,
|
|
NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
|
|
size_t *outsize)
|
|
{
|
|
const struct object_id *value_oid;
|
|
enum object_type type;
|
|
char *value;
|
|
unsigned long size;
|
|
|
|
value_oid = get_note(&c->tree, key_oid);
|
|
if (!value_oid)
|
|
return NULL;
|
|
value = odb_read_object(the_repository->objects, value_oid, &type, &size);
|
|
|
|
*outsize = size;
|
|
return value;
|
|
}
|
|
|
|
int notes_cache_put(struct notes_cache *c, struct object_id *key_oid,
|
|
const char *data, size_t size)
|
|
{
|
|
struct object_id value_oid;
|
|
|
|
if (odb_write_object(the_repository->objects, data,
|
|
size, OBJ_BLOB, &value_oid) < 0)
|
|
return -1;
|
|
return add_note(&c->tree, key_oid, &value_oid, NULL);
|
|
}
|