environment: make get_git_dir()
accept a repository
The `get_git_dir()` function retrieves the path to the Git 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
17d4b10aea
commit
246deeac95
@ -31,6 +31,7 @@
|
||||
#include "path.h"
|
||||
#include "preload-index.h"
|
||||
#include "read-cache.h"
|
||||
#include "repository.h"
|
||||
#include "resolve-undo.h"
|
||||
#include "revision.h"
|
||||
#include "strbuf.h"
|
||||
@ -3238,10 +3239,11 @@ static int should_delete_shared_index(const char *shared_index_path)
|
||||
static int clean_shared_index_files(const char *current_hex)
|
||||
{
|
||||
struct dirent *de;
|
||||
DIR *dir = opendir(get_git_dir());
|
||||
DIR *dir = opendir(repo_get_git_dir(the_repository));
|
||||
|
||||
if (!dir)
|
||||
return error_errno(_("unable to open git dir: %s"), get_git_dir());
|
||||
return error_errno(_("unable to open git dir: %s"),
|
||||
repo_get_git_dir(the_repository));
|
||||
|
||||
while ((de = readdir(dir)) != NULL) {
|
||||
const char *sha1_hex;
|
||||
|
Reference in New Issue
Block a user