kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

resolve-undo: stop using `the_repository` 

Stop using `the_repository` in the "resolve-undo" subsystem by passing
in the hash algorithm when reading or writing resolve-undo information.

While we could trivially update the caller to pass in the hash algorithm
used by the index itself, we instead pass in `the_hash_algo`. This is
mostly done to stay consistent with the rest of the code in that file,
which isn't prepared to handle arbitrary repositories, either.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2024-12-17 07:43:57 +01:00 committed by Junio C Hamano
parent 6c27d22276
commit b81093aeae
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
read-cache.c
View File

@ -1754,7 +1754,7 @@ static int read_index_extension(struct index_state *istate,
istate->cache_tree = cache_tree_read(data, sz); istate->cache_tree = cache_tree_read(data, sz);
break; break;
case CACHE_EXT_RESOLVE_UNDO: case CACHE_EXT_RESOLVE_UNDO:
istate->resolve_undo = resolve_undo_read(data, sz); istate->resolve_undo = resolve_undo_read(data, sz, the_hash_algo);
break; break;
case CACHE_EXT_LINK: case CACHE_EXT_LINK:
if (read_link_extension(istate, data, sz)) if (read_link_extension(istate, data, sz))
@ -3033,7 +3033,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
istate->resolve_undo) { istate->resolve_undo) {
strbuf_reset(&sb); strbuf_reset(&sb);


resolve_undo_write(&sb, istate->resolve_undo); resolve_undo_write(&sb, istate->resolve_undo, the_hash_algo);
err = write_index_ext_header(f, eoie_c, CACHE_EXT_RESOLVE_UNDO, err = write_index_ext_header(f, eoie_c, CACHE_EXT_RESOLVE_UNDO,
sb.len) < 0; sb.len) < 0;
hashwrite(f, sb.buf, sb.len); hashwrite(f, sb.buf, sb.len);

14
resolve-undo.c
View File

@ -1,4 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS #define DISABLE_SIGN_COMPARE_WARNINGS


#include "git-compat-util.h" #include "git-compat-util.h"
@ -34,7 +33,8 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
ui->mode[stage - 1] = ce->ce_mode; ui->mode[stage - 1] = ce->ce_mode;
} }


void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo) void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo,
const struct git_hash_algo *algop)
{ {
struct string_list_item *item; struct string_list_item *item;
for_each_string_list_item(item, resolve_undo) { for_each_string_list_item(item, resolve_undo) {
@ -50,18 +50,19 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (!ui->mode[i]) if (!ui->mode[i])
continue; continue;
strbuf_add(sb, ui->oid[i].hash, the_hash_algo->rawsz); strbuf_add(sb, ui->oid[i].hash, algop->rawsz);
} }
} }
} }


struct string_list *resolve_undo_read(const char *data, unsigned long size) struct string_list *resolve_undo_read(const char *data, unsigned long size,
const struct git_hash_algo *algop)
{ {
struct string_list *resolve_undo; struct string_list *resolve_undo;
size_t len; size_t len;
char *endptr; char *endptr;
int i; int i;
const unsigned rawsz = the_hash_algo->rawsz; const unsigned rawsz = algop->rawsz;


CALLOC_ARRAY(resolve_undo, 1); CALLOC_ARRAY(resolve_undo, 1);
resolve_undo->strdup_strings = 1; resolve_undo->strdup_strings = 1;
@ -96,8 +97,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
continue; continue;
if (size < rawsz) if (size < rawsz)
goto error; goto error;
oidread(&ui->oid[i], (const unsigned char *)data, oidread(&ui->oid[i], (const unsigned char *)data, algop);
the_repository->hash_algo);
size -= rawsz; size -= rawsz;
data += rawsz; data += rawsz;
} }

6
resolve-undo.h
View File

@ -14,8 +14,10 @@ struct resolve_undo_info {
}; };


void record_resolve_undo(struct index_state *, struct cache_entry *); void record_resolve_undo(struct index_state *, struct cache_entry *);
void resolve_undo_write(struct strbuf *, struct string_list *); void resolve_undo_write(struct strbuf *, struct string_list *,
struct string_list *resolve_undo_read(const char *, unsigned long); const struct git_hash_algo *algop);
struct string_list *resolve_undo_read(const char *, unsigned long,
const struct git_hash_algo *algop);
void resolve_undo_clear_index(struct index_state *); void resolve_undo_clear_index(struct index_state *);
int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned); int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
void unmerge_index(struct index_state *, const struct pathspec *, unsigned); void unmerge_index(struct index_state *, const struct pathspec *, unsigned);