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
@ -1,7 +1,6 @@
|
||||
#include "builtin.h"
|
||||
#include "abspath.h"
|
||||
#include "config.h"
|
||||
#include "environment.h"
|
||||
#include "gettext.h"
|
||||
#include "parse-options.h"
|
||||
#include "midx.h"
|
||||
@ -9,6 +8,7 @@
|
||||
#include "trace2.h"
|
||||
#include "object-store-ll.h"
|
||||
#include "replace-object.h"
|
||||
#include "repository.h"
|
||||
|
||||
#define BUILTIN_MIDX_WRITE_USAGE \
|
||||
N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \
|
||||
@ -63,7 +63,7 @@ static int parse_object_dir(const struct option *opt, const char *arg,
|
||||
char **value = opt->value;
|
||||
free(*value);
|
||||
if (unset)
|
||||
*value = xstrdup(get_object_directory());
|
||||
*value = xstrdup(repo_get_object_directory(the_repository));
|
||||
else
|
||||
*value = real_pathdup(arg, 1);
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user