diff options
| author | Stefan Beller <sbeller@google.com> | 2018-03-23 18:21:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 10:05:55 -0700 |
| commit | 13313fc333ef509465df6b681169e9842a99ae5d (patch) | |
| tree | 94a993c46179efbce31787d4ec457ab79296dd08 | |
| parent | 9a00580d0383fe60c70e966e66584e626ca3a846 (diff) | |
| download | git-13313fc333ef509465df6b681169e9842a99ae5d.tar.gz | |
sha1_file: add raw_object_store argument to alt_odb_usable
Add a raw_object_store to alt_odb_usable to be more specific about which
repository to act on. The choice of the repository is delegated to its
only caller link_alt_odb_entry.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c index 84b361c125..097c372d03 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -347,7 +347,9 @@ static const char *alt_sha1_path(struct alternate_object_database *alt, /* * Return non-zero iff the path is usable as an alternate object database. */ -static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir) +static int alt_odb_usable(struct raw_object_store *o, + struct strbuf *path, + const char *normalized_objdir) { struct alternate_object_database *alt; @@ -363,7 +365,7 @@ static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir) * Prevent the common mistake of listing the same * thing twice, or object directory itself. */ - for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next) { + for (alt = o->alt_odb_list; alt; alt = alt->next) { if (!fspathcmp(path->buf, alt->path)) return 0; } @@ -415,7 +417,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, while (pathbuf.len && pathbuf.buf[pathbuf.len - 1] == '/') strbuf_setlen(&pathbuf, pathbuf.len - 1); - if (!alt_odb_usable(&pathbuf, normalized_objdir)) { + if (!alt_odb_usable(the_repository->objects, &pathbuf, normalized_objdir)) { strbuf_release(&pathbuf); return -1; } |