setup: move prefix into repository

index 042d6de558..84e012f83f 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -84,7 +84,7 @@ static int get_path_commondir_absolute(struct repository *repo, struct strbuf *b if (!common_dir) return error(_("unable to get common directory")); - format_path(buf, common_dir, startup_info->prefix, PATH_FORMAT_CANONICAL); + format_path(buf, common_dir, repo->prefix, PATH_FORMAT_CANONICAL); return 0; } @@ -95,7 +95,7 @@ static int get_path_commondir_relative(struct repository *repo, struct strbuf *b if (!common_dir) return error(_("unable to get common directory")); - format_path(buf, common_dir, startup_info->prefix, PATH_FORMAT_RELATIVE); + format_path(buf, common_dir, repo->prefix, PATH_FORMAT_RELATIVE); return 0; } @@ -106,7 +106,7 @@ static int get_path_gitdir_absolute(struct repository *repo, struct strbuf *buf) if (!git_dir) return error(_("unable to get git directory")); - format_path(buf, git_dir, startup_info->prefix, PATH_FORMAT_CANONICAL); + format_path(buf, git_dir, repo->prefix, PATH_FORMAT_CANONICAL); return 0; } @@ -117,7 +117,7 @@ static int get_path_gitdir_relative(struct repository *repo, struct strbuf *buf) if (!git_dir) return error(_("unable to get git directory")); - format_path(buf, git_dir, startup_info->prefix, PATH_FORMAT_RELATIVE); + format_path(buf, git_dir, repo->prefix, PATH_FORMAT_RELATIVE); return 0; }

index 5e04b0e2bd..43693454d5 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -255,7 +255,7 @@ static int show_file(const char *arg, int output_prefix) show_default(); if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) { if (output_prefix) { - const char *prefix = startup_info->prefix; + const char *prefix = the_repository->prefix; char *fname = prefix_filename(prefix, arg); show(fname); free(fname); @@ -832,7 +832,8 @@ int cmd_rev_parse(int argc, prefix = argv[++i]; if (!prefix) die(_("--prefix requires an argument")); - startup_info->prefix = prefix; + FREE_AND_NULL(the_repository->prefix); + the_repository->prefix = xstrdup(prefix); output_prefix = 1; continue; }

index 3d6646c318..f43d150eb3 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -875,7 +875,7 @@ static enum parse_opt_result unresolve_callback( const char *arg, int unset) { int *has_errors = opt->value; - const char *prefix = startup_info->prefix; + const char *prefix = the_repository->prefix; BUG_ON_OPT_NEG(unset); BUG_ON_OPT_ARG(arg); @@ -896,7 +896,7 @@ static enum parse_opt_result reupdate_callback( const char *arg, int unset) { int *has_errors = opt->value; - const char *prefix = startup_info->prefix; + const char *prefix = the_repository->prefix; BUG_ON_OPT_NEG(unset); BUG_ON_OPT_ARG(arg);

index 46159466ac..fc70acc9e0 100644 --- a/object-name.c +++ b/object-name.c @@ -1708,8 +1708,8 @@ static char *resolve_relative_path(struct repository *r, const char *rel) die(_("relative path syntax can't be used outside working tree")); /* die() inside prefix_path() if resolved path is outside worktree */ - return prefix_path(the_repository, startup_info->prefix, - startup_info->prefix ? strlen(startup_info->prefix) : 0, + return prefix_path(the_repository, the_repository->prefix, + the_repository->prefix ? strlen(the_repository->prefix) : 0, rel); }

index 73d80bcffd..2ef0778846 100644 --- a/repository.c +++ b/repository.c @@ -376,6 +376,7 @@ void repo_clear(struct repository *repo) FREE_AND_NULL(repo->gitdir); FREE_AND_NULL(repo->commondir); + FREE_AND_NULL(repo->prefix); FREE_AND_NULL(repo->graft_file); FREE_AND_NULL(repo->index_file); FREE_AND_NULL(repo->worktree);

index 7d649e32e7..b767307911 100644 --- a/repository.h +++ b/repository.h @@ -52,6 +52,14 @@ struct repository { */ char *commondir; + /* + * The "prefix", a path to the current working directory relative to + * the work tree root, or NULL, if the current working directory is not + * a strict subdirectory of the work tree root. The prefix always ends + * with a '/' character. + */ + char *prefix; + /* * Holds any information related to accessing the raw object content. */

index b755693572..6cc9fa2de8 100644 --- a/setup.c +++ b/setup.c @@ -2030,7 +2030,7 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) * repository and that the caller expects startup_info to reflect * this. * - * Regardless of the state of nongit_ok, startup_info->prefix and + * Regardless of the state of nongit_ok, the_repository->prefix and * the GIT_PREFIX environment variable must always match. For details * see Documentation/config/alias.adoc. */ @@ -2105,10 +2105,10 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok) */ if (prefix) { prefix = precompose_string_if_needed(prefix); - startup_info->prefix = prefix; + repo->prefix = xstrdup(prefix); setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1); } else { - startup_info->prefix = NULL; + FREE_AND_NULL(repo->prefix); setenv(GIT_PREFIX_ENVIRONMENT, "", 1); }

index b9fd96bea6..c01a244fe9 100644 --- a/setup.h +++ b/setup.h @@ -299,7 +299,6 @@ struct startup_info { bool force_bare_repository; int have_repository; - const char *prefix; const char *original_cwd; }; extern struct startup_info *startup_info;

index 9b99460db8..515b99e7f5 100644 --- a/trace.c +++ b/trace.c @@ -299,7 +299,7 @@ static const char *quote_crnl(const char *path) void trace_repo_setup(struct repository *r) { - const char *git_work_tree, *prefix = startup_info->prefix; + const char *git_work_tree, *prefix = r->prefix; char *cwd; if (!trace_want(&trace_setup_key)) @@ -310,7 +310,7 @@ void trace_repo_setup(struct repository *r) if (!(git_work_tree = repo_get_work_tree(r))) git_work_tree = "(null)"; - if (!startup_info->prefix) + if (!r->prefix) prefix = "(null)"; trace_printf_key(&trace_setup_key, "setup: git_dir: %s\n", quote_crnl(repo_get_git_dir(r)));