Hi,
Stefan Beller wrote:
> See previous patch for explanation.
>
> While at it, move the declaration to object-store.h,
> where it should be easier to find.
Which declaration? It looks like prepare_alt_odb is already in
object-store.h.
[...]
> --- a/builtin/fsck.c
> +++ b/builtin/fsck.c
> @@ -717,7 +717,7 @@ int cmd_fsck(int argc, const char **argv, const char
> *prefix)
> } else {
> fsck_object_dir(get_object_directory());
>
> - prepare_alt_odb();
> + prepare_alt_odb(the_repository);
Patch 2 added a #include of "repository.h". Good.
(I checked because with the definition of prepare_alt_odb as a macro,
the function call would compile correctly even if the_repository
weren't in scope, but we want to include what we use as a matter of
style/maintainability.)
[...]
> --- a/packfile.c
> +++ b/packfile.c
> @@ -890,7 +890,7 @@ void prepare_packed_git(void)
> if (the_repository->objects.packed_git_initialized)
> return;
> prepare_packed_git_one(get_object_directory(), 1);
> - prepare_alt_odb();
> + prepare_alt_odb(the_repository);
Also good, since patch 3 added a #include of "repository.h".
[...]
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -23,6 +23,7 @@
> #include "sha1-lookup.h"
> #include "bulk-checkin.h"
> #include "repository.h"
> +#include "object-store.h"
Should this #include have been added in an earlier patch, since the
file both uses and defines prepare_alt_odb, which is declared there?
The rest looks good.
Thanks,
Jonathan