environment: make get_object_directory()
accept a repository
The `get_object_directory()` function retrieves the path to the object directory for `the_repository`. Make it accept a `struct repository` such that it can work on arbitrary repositories and make it part of the repository subsystem. This reduces our reliance on `the_repository` and clarifies scope. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
661624a4f6
commit
a3673f4898
@ -2053,7 +2053,7 @@ static int start_loose_object_common(struct strbuf *tmp_file,
|
||||
else if (errno == EACCES)
|
||||
return error(_("insufficient permission for adding "
|
||||
"an object to repository database %s"),
|
||||
get_object_directory());
|
||||
repo_get_object_directory(the_repository));
|
||||
else
|
||||
return error_errno(
|
||||
_("unable to create temporary file"));
|
||||
@ -2228,7 +2228,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len,
|
||||
prepare_loose_object_bulk_checkin();
|
||||
|
||||
/* Since oid is not determined, save tmp file to odb path. */
|
||||
strbuf_addf(&filename, "%s/", get_object_directory());
|
||||
strbuf_addf(&filename, "%s/", repo_get_object_directory(the_repository));
|
||||
hdrlen = format_object_header(hdr, sizeof(hdr), OBJ_BLOB, len);
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user