Merge branch 'ps/path-sans-the-repository'
The path.[ch] API takes an explicit repository parameter passed throughout the callchain, instead of relying on the_repository singleton instance. * ps/path-sans-the-repository: path: adjust last remaining users of `the_repository` environment: move access to "core.sharedRepository" into repo settings environment: move access to "core.hooksPath" into repo settings repo-settings: introduce function to clear struct path: drop `git_path()` in favor of `repo_git_path()` rerere: let `rerere_path()` write paths into a caller-provided buffer path: drop `git_common_path()` in favor of `repo_common_path()` worktree: return allocated string from `get_worktree_git_dir()` path: drop `git_path_buf()` in favor of `repo_git_path_replace()` path: drop `git_pathdup()` in favor of `repo_git_path()` path: drop unused `strbuf_git_path()` function path: refactor `repo_submodule_path()` family of functions submodule: refactor `submodule_to_gitdir()` to accept a repo path: refactor `repo_worktree_path()` family of functions path: refactor `repo_git_path()` family of functions path: refactor `repo_common_path()` family of functions
This commit is contained in:
@@ -380,7 +380,7 @@ static struct ref_store *reftable_be_init(struct repository *repo,
|
||||
default:
|
||||
BUG("unknown hash algorithm %d", repo->hash_algo->format_id);
|
||||
}
|
||||
refs->write_options.default_permissions = calc_shared_perm(0666 & ~mask);
|
||||
refs->write_options.default_permissions = calc_shared_perm(the_repository, 0666 & ~mask);
|
||||
refs->write_options.disable_auto_compact =
|
||||
!git_env_bool("GIT_TEST_REFTABLE_AUTOCOMPACTION", 1);
|
||||
refs->write_options.lock_timeout_ms = 100;
|
||||
@@ -470,21 +470,21 @@ static int reftable_be_create_on_disk(struct ref_store *ref_store,
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
strbuf_addf(&sb, "%s/reftable", refs->base.gitdir);
|
||||
safe_create_dir(sb.buf, 1);
|
||||
safe_create_dir(the_repository, sb.buf, 1);
|
||||
strbuf_reset(&sb);
|
||||
|
||||
strbuf_addf(&sb, "%s/HEAD", refs->base.gitdir);
|
||||
write_file(sb.buf, "ref: refs/heads/.invalid");
|
||||
adjust_shared_perm(sb.buf);
|
||||
adjust_shared_perm(the_repository, sb.buf);
|
||||
strbuf_reset(&sb);
|
||||
|
||||
strbuf_addf(&sb, "%s/refs", refs->base.gitdir);
|
||||
safe_create_dir(sb.buf, 1);
|
||||
safe_create_dir(the_repository, sb.buf, 1);
|
||||
strbuf_reset(&sb);
|
||||
|
||||
strbuf_addf(&sb, "%s/refs/heads", refs->base.gitdir);
|
||||
write_file(sb.buf, "this repository uses the reftable format");
|
||||
adjust_shared_perm(sb.buf);
|
||||
adjust_shared_perm(the_repository, sb.buf);
|
||||
|
||||
strbuf_release(&sb);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user