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>

diff --git a/read-cache.c b/read-cache.c
index 38c36caa7fef4d44da74c29e059839d88426df15..d54be2c17268728caf3e1e3ef94a5832d2cbfa60 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1754,7 +1754,7 @@ static int read_index_extension(struct index_state *istate,
                istate->cache_tree = cache_tree_read(data, sz);
                break;
        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;
        case CACHE_EXT_LINK:
                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) {
                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,
                                             sb.len) < 0;
                hashwrite(f, sb.buf, sb.len);

diff --git a/resolve-undo.c b/resolve-undo.c
index b5a9dfb4acc51173b1d9b7b1b044a1fc611d3f74..52c45e5a49463656a48fc036749ee2749debaaac 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -1,4 +1,3 @@
-#define USE_THE_REPOSITORY_VARIABLE
 #define DISABLE_SIGN_COMPARE_WARNINGS
 
 #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;
 }
 
-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;
        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++) {
                        if (!ui->mode[i])
                                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;
        size_t len;
        char *endptr;
        int i;
-       const unsigned rawsz = the_hash_algo->rawsz;
+       const unsigned rawsz = algop->rawsz;
 
        CALLOC_ARRAY(resolve_undo, 1);
        resolve_undo->strdup_strings = 1;
@@ -96,8 +97,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
                                continue;
                        if (size < rawsz)
                                goto error;
-                       oidread(&ui->oid[i], (const unsigned char *)data,
-                               the_repository->hash_algo);
+                       oidread(&ui->oid[i], (const unsigned char *)data, algop);
                        size -= rawsz;
                        data += rawsz;
                }

diff --git a/resolve-undo.h b/resolve-undo.h
index 89a32272620f2b9e93102039204c72c7886306b3..7ed11a1c59b8192df9bdc9bdad560e06d9f0b9e5 100644 (file)
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -14,8 +14,10 @@ struct resolve_undo_info {
 };
 
 void record_resolve_undo(struct index_state *, struct cache_entry *);
-void resolve_undo_write(struct strbuf *, struct string_list *);
-struct string_list *resolve_undo_read(const char *, unsigned long);
+void resolve_undo_write(struct strbuf *, struct string_list *,
+                       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 *);
 int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
 void unmerge_index(struct index_state *, const struct pathspec *, unsigned);