Re: [PATCH 22/27] sha1_file: allow sha1_file_name to handle arbitrary repositories
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Feb 22, 2018, 00:44 UTC
- Message-ID
- <20180221164406.c98170765e454b51de80c680@google.com>
- In-Reply-To
- <20180221015430.96054-23-sbeller@google.com>
On Tue, 20 Feb 2018 17:54:25 -0800 Stefan Beller <sbeller@google.com> wrote:
> Signed-off-by: Stefan Beller <sbeller@google.com> > Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Show 8 quoted lines
> -void sha1_file_name_the_repository(struct strbuf *buf, const unsigned char *sha1)
> +void sha1_file_name(struct repository *r, struct strbuf *buf, const unsigned char *sha1)
> {
> - strbuf_addstr(buf, get_object_directory());
> + strbuf_addstr(buf, r->objects.objectdir);
> strbuf_addch(buf, '/');
> fill_sha1_path(buf, sha1);
> }In the future, we should probably have: - a function to get the object store out of a repo (so that it can lazily initialize the object store struct if necessary) - when the object store is obtained, its objectdir field is guaranteed to be populated - sha1_file_name should take the object store struct, not the repo struct
but this is outside the scope of this patch.