Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanup
* ps/object-wo-the-repository: hash: stop depending on `the_repository` in `null_oid()` hash: fix "-Wsign-compare" warnings object-file: split out logic regarding hash algorithms delta-islands: stop depending on `the_repository` object-file-convert: stop depending on `the_repository` pack-bitmap-write: stop depending on `the_repository` pack-revindex: stop depending on `the_repository` pack-check: stop depending on `the_repository` environment: move access to "core.bigFileThreshold" into repo settings pack-write: stop depending on `the_repository` and `the_hash_algo` object: stop depending on `the_repository` csum-file: stop depending on `the_repository`
This commit is contained in:
@@ -505,7 +505,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
|
||||
* has not been resolved yet.
|
||||
*/
|
||||
oidclr(&obj_list[nr].oid, the_repository->hash_algo);
|
||||
add_delta_to_list(nr, null_oid(), base_offset,
|
||||
add_delta_to_list(nr, null_oid(the_hash_algo), base_offset,
|
||||
delta_data, delta_size);
|
||||
return;
|
||||
}
|
||||
@@ -553,7 +553,8 @@ static void unpack_one(unsigned nr)
|
||||
|
||||
switch (type) {
|
||||
case OBJ_BLOB:
|
||||
if (!dry_run && size > big_file_threshold) {
|
||||
if (!dry_run &&
|
||||
size > repo_settings_get_big_file_threshold(the_repository)) {
|
||||
stream_blob(size, nr);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user