{"thread":{"id":"13293","subject":"[PATCH 4/8] Add a function to set a non-default work tree","startedAt":"2008-04-27T17:39:21Z","lastAt":"2008-04-27T17:39:21Z","messageCount":1,"participants":["Daniel Barkalow"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"75314","messageId":"alpine.LNX.1.00.0804271302390.19665@iabervon.org","threadId":"13293","inReplyTo":null,"subject":"[PATCH 4/8] Add a function to set a non-default work tree","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-04-27T17:39:21Z","receivedAt":"2008-04-27T17:39:21Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"This function may only be used before the work tree is used.\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\n---\n cache.h       |    1 +\n environment.c |   19 +++++++++++++++----\n 2 files changed, 16 insertions(+), 4 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex cdde6b0..b337b3d 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -311,6 +311,7 @@ extern char *get_index_file(void);\n extern char *get_graft_file(void);\n extern int set_git_dir(const char *path);\n extern const char *get_git_work_tree(void);\n+extern void set_git_work_tree(const char *tree);\n \n #define ALTERNATE_DB_ENVIRONMENT \"GIT_ALTERNATE_OBJECT_DIRECTORIES\"\n \ndiff --git a/environment.c b/environment.c\nindex 6739a3f..1919125 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -41,7 +41,7 @@ enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;\n \n /* This is set by setup_git_dir_gently() and/or git_default_config() */\n char *git_work_tree_cfg;\n-static const char *work_tree;\n+static char *work_tree;\n \n static const char *git_dir;\n static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;\n@@ -81,10 +81,21 @@ const char *get_git_dir(void)\n \treturn git_dir;\n }\n \n+static int git_work_tree_initialized;\n+\n+void set_git_work_tree(const char *new_work_tree)\n+{\n+\tif (is_bare_repository_cfg >= 0)\n+\t\tdie(\"cannot set work tree after initialization\");\n+\tgit_work_tree_initialized = 1;\n+\tfree(work_tree);\n+\twork_tree = xstrdup(make_absolute_path(new_work_tree));\n+\tis_bare_repository_cfg = 0;\n+}\n+\n const char *get_git_work_tree(void)\n {\n-\tstatic int initialized = 0;\n-\tif (!initialized) {\n+\tif (!git_work_tree_initialized) {\n \t\twork_tree = getenv(GIT_WORK_TREE_ENVIRONMENT);\n \t\t/* core.bare = true overrides implicit and config work tree */\n \t\tif (!work_tree && is_bare_repository_cfg < 1) {\n@@ -94,7 +105,7 @@ const char *get_git_work_tree(void)\n \t\t\t\twork_tree = xstrdup(make_absolute_path(git_path(work_tree)));\n \t\t} else if (work_tree)\n \t\t\twork_tree = xstrdup(make_absolute_path(work_tree));\n-\t\tinitialized = 1;\n+\t\tgit_work_tree_initialized = 1;\n \t\tif (work_tree)\n \t\t\tis_bare_repository_cfg = 0;\n \t}\n-- \n1.5.4.3.610.gea6cd\n"}]}