refs/packed: stop using `the_repository`
Convert the packed ref backend to stop using `the_repository` in favor of the repo that gets passed in via `struct ref_store`. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Jul 30, 2024 at 07:23 UTC
79e54c6a4ed0e091909ffd6754d795b113c33a76
1 file changed
+6
-8
refs/packed-backend.c
+6
-8
@@ -1,5 +1,3 @@
1
-#define USE_THE_REPOSITORY_VARIABLE
2
-
1
#include "../git-compat-util.h"
2
#include "../config.h"
3
#include "../dir.h"
@@ -794,7 +792,7 @@ static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname,
792
return -1;
793
}
794
797
- if (get_oid_hex(rec, oid))
795
+ if (get_oid_hex_algop(rec, oid, ref_store->repo->hash_algo))
796
die_invalid_line(refs->path, rec, snapshot->eof - rec);
797
798
*type = REF_ISPACKED;
@@ -879,7 +877,7 @@ static int next_record(struct packed_ref_iterator *iter)
877
p = iter->pos;
878
879
if (iter->eof - p < snapshot_hexsz(iter->snapshot) + 2 ||
882
- parse_oid_hex(p, &iter->oid, &p) ||
880
+ parse_oid_hex_algop(p, &iter->oid, &p, iter->repo->hash_algo) ||
881
!isspace(*p++))
882
die_invalid_line(iter->snapshot->refs->path,
883
iter->pos, iter->eof - iter->pos);
@@ -896,7 +894,7 @@ static int next_record(struct packed_ref_iterator *iter)
894
if (!refname_is_safe(iter->base.refname))
895
die("packed refname is dangerous: %s",
896
iter->base.refname);
899
- oidclr(&iter->oid, the_repository->hash_algo);
897
+ oidclr(&iter->oid, iter->repo->hash_algo);
898
iter->base.flags |= REF_BAD_NAME | REF_ISBROKEN;
899
}
900
if (iter->snapshot->peeled == PEELED_FULLY ||
@@ -909,7 +907,7 @@ static int next_record(struct packed_ref_iterator *iter)
907
if (iter->pos < iter->eof && *iter->pos == '^') {
908
p = iter->pos + 1;
909
if (iter->eof - p < snapshot_hexsz(iter->snapshot) + 1 ||
912
- parse_oid_hex(p, &iter->peeled, &p) ||
910
+ parse_oid_hex_algop(p, &iter->peeled, &p, iter->repo->hash_algo) ||
911
*p++ != '\n')
912
die_invalid_line(iter->snapshot->refs->path,
913
iter->pos, iter->eof - iter->pos);
@@ -921,13 +919,13 @@ static int next_record(struct packed_ref_iterator *iter)
919
* we suppress it if the reference is broken:
920
*/
921
if ((iter->base.flags & REF_ISBROKEN)) {
924
- oidclr(&iter->peeled, the_repository->hash_algo);
922
+ oidclr(&iter->peeled, iter->repo->hash_algo);
923
iter->base.flags &= ~REF_KNOWS_PEELED;
924
} else {
925
iter->base.flags |= REF_KNOWS_PEELED;
926
}
927
} else {
930
- oidclr(&iter->peeled, the_repository->hash_algo);
928
+ oidclr(&iter->peeled, iter->repo->hash_algo);
929
}
930
931
return ITER_OK;