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:
Junio C Hamano
70
setup.c
70
setup.c
@ -792,7 +792,7 @@ int upgrade_repository_format(int target_version)
|
||||
struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
|
||||
int ret;
|
||||
|
||||
strbuf_git_common_path(&sb, the_repository, "config");
|
||||
repo_common_path_append(the_repository, &sb, "config");
|
||||
read_repository_format(&repo_fmt, sb.buf);
|
||||
strbuf_release(&sb);
|
||||
|
||||
@ -2088,7 +2088,7 @@ static void copy_templates_1(struct strbuf *path, struct strbuf *template_path,
|
||||
* with the way the namespace under .git/ is organized, should
|
||||
* be really carefully chosen.
|
||||
*/
|
||||
safe_create_dir(path->buf, 1);
|
||||
safe_create_dir(the_repository, path->buf, 1);
|
||||
while ((de = readdir(dir)) != NULL) {
|
||||
struct stat st_git, st_template;
|
||||
int exists = 0;
|
||||
@ -2242,7 +2242,7 @@ void initialize_repository_version(int hash_algo,
|
||||
struct strbuf config = STRBUF_INIT;
|
||||
struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
|
||||
|
||||
strbuf_git_common_path(&config, the_repository, "config");
|
||||
repo_common_path_append(the_repository, &config, "config");
|
||||
read_repository_format(&repo_fmt, config.buf);
|
||||
|
||||
if (repo_fmt.v1_only_extensions.nr)
|
||||
@ -2264,7 +2264,7 @@ static int is_reinit(void)
|
||||
char junk[2];
|
||||
int ret;
|
||||
|
||||
git_path_buf(&buf, "HEAD");
|
||||
repo_git_path_replace(the_repository, &buf, "HEAD");
|
||||
ret = !access(buf.buf, R_OK) || readlink(buf.buf, junk, sizeof(junk) - 1) != -1;
|
||||
strbuf_release(&buf);
|
||||
return ret;
|
||||
@ -2316,8 +2316,7 @@ static int create_default_files(const char *template_path,
|
||||
int init_shared_repository)
|
||||
{
|
||||
struct stat st1;
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
char *path;
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
int reinit;
|
||||
int filemode;
|
||||
const char *work_tree = repo_get_work_tree(the_repository);
|
||||
@ -2333,7 +2332,7 @@ static int create_default_files(const char *template_path,
|
||||
*/
|
||||
copy_templates(template_path);
|
||||
git_config_clear();
|
||||
reset_shared_repository();
|
||||
repo_settings_reset_shared_repository(the_repository);
|
||||
git_config(git_default_config, NULL);
|
||||
|
||||
reinit = is_reinit();
|
||||
@ -2343,7 +2342,8 @@ static int create_default_files(const char *template_path,
|
||||
* values we might have just re-read from the config.
|
||||
*/
|
||||
if (init_shared_repository != -1)
|
||||
set_shared_repository(init_shared_repository);
|
||||
repo_settings_set_shared_repository(the_repository,
|
||||
init_shared_repository);
|
||||
|
||||
is_bare_repository_cfg = !work_tree;
|
||||
|
||||
@ -2351,21 +2351,21 @@ static int create_default_files(const char *template_path,
|
||||
* We would have created the above under user's umask -- under
|
||||
* shared-repository settings, we would need to fix them up.
|
||||
*/
|
||||
if (get_shared_repository()) {
|
||||
adjust_shared_perm(repo_get_git_dir(the_repository));
|
||||
if (repo_settings_get_shared_repository(the_repository)) {
|
||||
adjust_shared_perm(the_repository, repo_get_git_dir(the_repository));
|
||||
}
|
||||
|
||||
initialize_repository_version(fmt->hash_algo, fmt->ref_storage_format, reinit);
|
||||
|
||||
/* Check filemode trustability */
|
||||
path = git_path_buf(&buf, "config");
|
||||
repo_git_path_replace(the_repository, &path, "config");
|
||||
filemode = TEST_FILEMODE;
|
||||
if (TEST_FILEMODE && !lstat(path, &st1)) {
|
||||
if (TEST_FILEMODE && !lstat(path.buf, &st1)) {
|
||||
struct stat st2;
|
||||
filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
|
||||
!lstat(path, &st2) &&
|
||||
filemode = (!chmod(path.buf, st1.st_mode ^ S_IXUSR) &&
|
||||
!lstat(path.buf, &st2) &&
|
||||
st1.st_mode != st2.st_mode &&
|
||||
!chmod(path, st1.st_mode));
|
||||
!chmod(path.buf, st1.st_mode));
|
||||
if (filemode && !reinit && (st1.st_mode & S_IXUSR))
|
||||
filemode = 0;
|
||||
}
|
||||
@ -2384,24 +2384,24 @@ static int create_default_files(const char *template_path,
|
||||
|
||||
if (!reinit) {
|
||||
/* Check if symlink is supported in the work tree */
|
||||
path = git_path_buf(&buf, "tXXXXXX");
|
||||
if (!close(xmkstemp(path)) &&
|
||||
!unlink(path) &&
|
||||
!symlink("testing", path) &&
|
||||
!lstat(path, &st1) &&
|
||||
repo_git_path_replace(the_repository, &path, "tXXXXXX");
|
||||
if (!close(xmkstemp(path.buf)) &&
|
||||
!unlink(path.buf) &&
|
||||
!symlink("testing", path.buf) &&
|
||||
!lstat(path.buf, &st1) &&
|
||||
S_ISLNK(st1.st_mode))
|
||||
unlink(path); /* good */
|
||||
unlink(path.buf); /* good */
|
||||
else
|
||||
git_config_set("core.symlinks", "false");
|
||||
|
||||
/* Check if the filesystem is case-insensitive */
|
||||
path = git_path_buf(&buf, "CoNfIg");
|
||||
if (!access(path, F_OK))
|
||||
repo_git_path_replace(the_repository, &path, "CoNfIg");
|
||||
if (!access(path.buf, F_OK))
|
||||
git_config_set("core.ignorecase", "true");
|
||||
probe_utf8_pathname_composition();
|
||||
}
|
||||
|
||||
strbuf_release(&buf);
|
||||
strbuf_release(&path);
|
||||
return reinit;
|
||||
}
|
||||
|
||||
@ -2413,15 +2413,15 @@ static void create_object_directory(void)
|
||||
strbuf_addstr(&path, repo_get_object_directory(the_repository));
|
||||
baselen = path.len;
|
||||
|
||||
safe_create_dir(path.buf, 1);
|
||||
safe_create_dir(the_repository, path.buf, 1);
|
||||
|
||||
strbuf_setlen(&path, baselen);
|
||||
strbuf_addstr(&path, "/pack");
|
||||
safe_create_dir(path.buf, 1);
|
||||
safe_create_dir(the_repository, path.buf, 1);
|
||||
|
||||
strbuf_setlen(&path, baselen);
|
||||
strbuf_addstr(&path, "/info");
|
||||
safe_create_dir(path.buf, 1);
|
||||
safe_create_dir(the_repository, path.buf, 1);
|
||||
|
||||
strbuf_release(&path);
|
||||
}
|
||||
@ -2592,7 +2592,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
|
||||
*/
|
||||
git_config(platform_core_config, NULL);
|
||||
|
||||
safe_create_dir(git_dir, 0);
|
||||
safe_create_dir(the_repository, git_dir, 0);
|
||||
|
||||
reinit = create_default_files(template_dir, original_git_dir,
|
||||
&repo_fmt, init_shared_repository);
|
||||
@ -2602,7 +2602,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
|
||||
initial_branch, flags & INIT_DB_QUIET);
|
||||
create_object_directory();
|
||||
|
||||
if (get_shared_repository()) {
|
||||
if (repo_settings_get_shared_repository(the_repository)) {
|
||||
char buf[10];
|
||||
/* We do not spell "group" and such, so that
|
||||
* the configuration can be read by older version
|
||||
@ -2610,12 +2610,12 @@ int init_db(const char *git_dir, const char *real_git_dir,
|
||||
* and compatibility values for PERM_GROUP and
|
||||
* PERM_EVERYBODY.
|
||||
*/
|
||||
if (get_shared_repository() < 0)
|
||||
if (repo_settings_get_shared_repository(the_repository) < 0)
|
||||
/* force to the mode value */
|
||||
xsnprintf(buf, sizeof(buf), "0%o", -get_shared_repository());
|
||||
else if (get_shared_repository() == PERM_GROUP)
|
||||
xsnprintf(buf, sizeof(buf), "0%o", -repo_settings_get_shared_repository(the_repository));
|
||||
else if (repo_settings_get_shared_repository(the_repository) == PERM_GROUP)
|
||||
xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_GROUP);
|
||||
else if (get_shared_repository() == PERM_EVERYBODY)
|
||||
else if (repo_settings_get_shared_repository(the_repository) == PERM_EVERYBODY)
|
||||
xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
|
||||
else
|
||||
BUG("invalid value for shared_repository");
|
||||
@ -2627,12 +2627,12 @@ int init_db(const char *git_dir, const char *real_git_dir,
|
||||
int len = strlen(git_dir);
|
||||
|
||||
if (reinit)
|
||||
printf(get_shared_repository()
|
||||
printf(repo_settings_get_shared_repository(the_repository)
|
||||
? _("Reinitialized existing shared Git repository in %s%s\n")
|
||||
: _("Reinitialized existing Git repository in %s%s\n"),
|
||||
git_dir, len && git_dir[len-1] != '/' ? "/" : "");
|
||||
else
|
||||
printf(get_shared_repository()
|
||||
printf(repo_settings_get_shared_repository(the_repository)
|
||||
? _("Initialized empty shared Git repository in %s%s\n")
|
||||
: _("Initialized empty Git repository in %s%s\n"),
|
||||
git_dir, len && git_dir[len-1] != '/' ? "/" : "");
|
||||
|
||||
Reference in New Issue
Block a user