1
- #define USE_THE_REPOSITORY_VARIABLE
2
-
3
1
#include "../git-compat-util.h"
4
2
#include "../config.h"
5
3
#include "../dir.h"
@@ -794,7 +792,7 @@ static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname,
794
792
return -1 ;
795
793
}
796
794
797
- if (get_oid_hex (rec , oid ))
795
+ if (get_oid_hex_algop (rec , oid , ref_store -> repo -> hash_algo ))
798
796
die_invalid_line (refs -> path , rec , snapshot -> eof - rec );
799
797
800
798
* type = REF_ISPACKED ;
@@ -879,7 +877,7 @@ static int next_record(struct packed_ref_iterator *iter)
879
877
p = iter -> pos ;
880
878
881
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 ) ||
883
881
!isspace (* p ++ ))
884
882
die_invalid_line (iter -> snapshot -> refs -> path ,
885
883
iter -> pos , iter -> eof - iter -> pos );
@@ -896,7 +894,7 @@ static int next_record(struct packed_ref_iterator *iter)
896
894
if (!refname_is_safe (iter -> base .refname ))
897
895
die ("packed refname is dangerous: %s" ,
898
896
iter -> base .refname );
899
- oidclr (& iter -> oid , the_repository -> hash_algo );
897
+ oidclr (& iter -> oid , iter -> repo -> hash_algo );
900
898
iter -> base .flags |= REF_BAD_NAME | REF_ISBROKEN ;
901
899
}
902
900
if (iter -> snapshot -> peeled == PEELED_FULLY ||
@@ -909,7 +907,7 @@ static int next_record(struct packed_ref_iterator *iter)
909
907
if (iter -> pos < iter -> eof && * iter -> pos == '^' ) {
910
908
p = iter -> pos + 1 ;
911
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 ) ||
913
911
* p ++ != '\n' )
914
912
die_invalid_line (iter -> snapshot -> refs -> path ,
915
913
iter -> pos , iter -> eof - iter -> pos );
@@ -921,13 +919,13 @@ static int next_record(struct packed_ref_iterator *iter)
921
919
* we suppress it if the reference is broken:
922
920
*/
923
921
if ((iter -> base .flags & REF_ISBROKEN )) {
924
- oidclr (& iter -> peeled , the_repository -> hash_algo );
922
+ oidclr (& iter -> peeled , iter -> repo -> hash_algo );
925
923
iter -> base .flags &= ~REF_KNOWS_PEELED ;
926
924
} else {
927
925
iter -> base .flags |= REF_KNOWS_PEELED ;
928
926
}
929
927
} else {
930
- oidclr (& iter -> peeled , the_repository -> hash_algo );
928
+ oidclr (& iter -> peeled , iter -> repo -> hash_algo );
931
929
}
932
930
933
931
return ITER_OK ;
0 commit comments