Merge master into aw/mirror-push

1 files changed, 10 insertions, 0 deletions

diff --git a/setup.c b/setup.c
index 145eca50f4..1e2c55d076 100644
--- a/setup.c
+++ b/setup.c
@@ -206,6 +206,16 @@ static const char *set_work_tree(const char *dir)
 	return NULL;
 }
 
+void setup_work_tree(void)
+{
+	const char *work_tree = get_git_work_tree();
+	const char *git_dir = get_git_dir();
+	if (!is_absolute_path(git_dir))
+		set_git_dir(make_absolute_path(git_dir));
+	if (!work_tree || chdir(work_tree))
+		die("This operation must be run in a work tree");
+}
+
 /*
  * We cannot decide in this function whether we are in the work tree or
  * not, since the config can only be read _after_ this function was called.