mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

environment: store worktree in the_repository

Browse Source 
Migrate 'work_tree' to be stored in 'the_repository'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-06-22 11:43:34 -07:00
committed by Junio C Hamano
parent c14c234f22
commit b415873282
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
environment.c
View File

@ -96,7 +96,6 @@ int ignore_untracked_cache_config;
/* This is set by setup_git_dir_gently() and/or git_default_config() */ /* This is set by setup_git_dir_gently() and/or git_default_config() */
char *git_work_tree_cfg; char *git_work_tree_cfg;
static char *work_tree;
static const char *namespace; static const char *namespace;
@ -223,19 +222,19 @@ void set_git_work_tree(const char *new_work_tree)
{ {
if (git_work_tree_initialized) { if (git_work_tree_initialized) {
new_work_tree = real_path(new_work_tree); new_work_tree = real_path(new_work_tree);
if (strcmp(new_work_tree, work_tree)) if (strcmp(new_work_tree, the_repository->worktree))
die("internal error: work tree has already been set\n" die("internal error: work tree has already been set\n"
"Current worktree: %s\nNew worktree: %s", "Current worktree: %s\nNew worktree: %s",
work_tree, new_work_tree); the_repository->worktree, new_work_tree);
return; return;
} }
git_work_tree_initialized = 1; git_work_tree_initialized = 1;
work_tree = real_pathdup(new_work_tree, 1); repo_set_worktree(the_repository, new_work_tree);
} }
const char *get_git_work_tree(void) const char *get_git_work_tree(void)
{ {
return work_tree; return the_repository->worktree;
} }
char *get_object_directory(void) char *get_object_directory(void)