object-file: get rid of `the_repository` in index-related functions

Git fork

Both `index_fd()` and `index_path()` still use `the_repository` even
though they have a repository available via `struct index_state`. Adapt
them so that they use the index' repository instead to get rid of this
global dependency.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Patrick Steinhardt and committed by

Junio C Hamano 8 months ago 5f2e994e c2b5d149

+3 -3

1 changed file

expand all

object-file.c

+3 -3

object-file.c

··· 1257 1257 ret = index_stream_convert_blob(istate, oid, fd, path, flags); 1258 1258 else if (!S_ISREG(st->st_mode)) 1259 1259 ret = index_pipe(istate, oid, fd, type, path, flags); 1260 - else if ((st->st_size >= 0 && (size_t) st->st_size <= repo_settings_get_big_file_threshold(the_repository)) || 1260 + else if ((st->st_size >= 0 && (size_t) st->st_size <= repo_settings_get_big_file_threshold(istate->repo)) || 1261 1261 type != OBJ_BLOB || 1262 1262 (path && would_convert_to_git(istate, path))) 1263 1263 ret = index_core(istate, oid, fd, xsize_t(st->st_size), ··· 1291 1291 if (!(flags & INDEX_WRITE_OBJECT)) 1292 1292 hash_object_file(istate->repo->hash_algo, sb.buf, sb.len, 1293 1293 OBJ_BLOB, oid); 1294 - else if (odb_write_object(the_repository->objects, sb.buf, sb.len, OBJ_BLOB, oid)) 1294 + else if (odb_write_object(istate->repo->objects, sb.buf, sb.len, OBJ_BLOB, oid)) 1295 1295 rc = error(_("%s: failed to insert into database"), path); 1296 1296 strbuf_release(&sb); 1297 1297 break; 1298 1298 case S_IFDIR: 1299 - return repo_resolve_gitlink_ref(the_repository, path, "HEAD", oid); 1299 + return repo_resolve_gitlink_ref(istate->repo, path, "HEAD", oid); 1300 1300 default: 1301 1301 return error(_("%s: unsupported file type"), path); 1302 1302 }