sha1_file: add repository argument to prepare_alt_odb
See previous patch for explanation. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.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>
Stefan Beller committed
Mar 23, 2018 at 18:21 UTC
0b2090340544caaabb378706a6ed3853dd617a6f
5 files changed
+11
-10
builtin/fsck.c
+1
-1
@@ -719,7 +719,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
719
720
fsck_object_dir(get_object_directory());
721
722
- prepare_alt_odb();
722
+ prepare_alt_odb(the_repository);
723
alt_odb_list = the_repository->objects->alt_odb_list;
724
for (alt = alt_odb_list; alt; alt = alt->next)
725
fsck_object_dir(alt->path);
object-store.h
+2
-1
@@ -20,7 +20,8 @@ struct alternate_object_database {
20
21
char path[FLEX_ARRAY];
22
};
23
-void prepare_alt_odb(void);
23
+#define prepare_alt_odb(r) prepare_alt_odb_##r()
24
+void prepare_alt_odb_the_repository(void);
25
char *compute_alternate_path(const char *path, struct strbuf *err);
26
typedef int alt_odb_fn(struct alternate_object_database *, void *);
27
int foreach_alt_odb(alt_odb_fn, void*);
packfile.c
+1
-1
@@ -890,7 +890,7 @@ void prepare_packed_git(void)
890
if (the_repository->objects->packed_git_initialized)
891
return;
892
prepare_packed_git_one(get_object_directory(), 1);
893
- prepare_alt_odb();
893
+ prepare_alt_odb(the_repository);
894
for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)
895
prepare_packed_git_one(alt->path, 0);
896
rearrange_packed_git();
sha1_file.c
+6
-6
@@ -582,7 +582,7 @@ void add_to_alternates_memory(const char *reference)
582
* Make sure alternates are initialized, or else our entry may be
583
* overwritten when they are.
584
*/
585
- prepare_alt_odb();
585
+ prepare_alt_odb(the_repository);
586
587
link_alt_odb_entries(the_repository, reference,
588
'\n', NULL, 0);
@@ -668,7 +668,7 @@ int foreach_alt_odb(alt_odb_fn fn, void *cb)
668
struct alternate_object_database *ent;
669
int r = 0;
670
671
- prepare_alt_odb();
671
+ prepare_alt_odb(the_repository);
672
for (ent = the_repository->objects->alt_odb_list; ent; ent = ent->next) {
673
r = fn(ent, cb);
674
if (r)
@@ -677,7 +677,7 @@ int foreach_alt_odb(alt_odb_fn fn, void *cb)
677
return r;
678
}
679
680
-void prepare_alt_odb(void)
680
+void prepare_alt_odb_the_repository(void)
681
{
682
if (the_repository->objects->alt_odb_tail)
683
return;
@@ -728,7 +728,7 @@ static int check_and_freshen_local(const unsigned char *sha1, int freshen)
728
static int check_and_freshen_nonlocal(const unsigned char *sha1, int freshen)
729
{
730
struct alternate_object_database *alt;
731
- prepare_alt_odb();
731
+ prepare_alt_odb(the_repository);
732
for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next) {
733
const char *path = alt_sha1_path(alt, sha1);
734
if (check_and_freshen_file(path, freshen))
@@ -887,7 +887,7 @@ static int stat_sha1_file(const unsigned char *sha1, struct stat *st,
887
if (!lstat(*path, st))
888
return 0;
889
890
- prepare_alt_odb();
890
+ prepare_alt_odb(the_repository);
891
errno = ENOENT;
892
for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next) {
893
*path = alt_sha1_path(alt, sha1);
@@ -918,7 +918,7 @@ static int open_sha1_file(const unsigned char *sha1, const char **path)
918
return fd;
919
most_interesting_errno = errno;
920
921
- prepare_alt_odb();
921
+ prepare_alt_odb(the_repository);
922
for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next) {
923
*path = alt_sha1_path(alt, sha1);
924
fd = git_open(*path);
sha1_name.c
+1
-1
@@ -354,7 +354,7 @@ static int init_object_disambiguation(const char *name, int len,
354
355
ds->len = len;
356
ds->hex_pfx[len] = '\0';
357
- prepare_alt_odb();
357
+ prepare_alt_odb(the_repository);
358
return 0;
359
}
360