summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2007-11-03 12:23:11 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-05 22:47:57 -0800
commit59f0f2f33a420e9a14bb8cef20d38f508f0d098e (patch)
tree3a6b8cf5e96e4ae841b900a2f57d59ff827aa149 /git.c
parentfe61935007b6803ce116e233316e4ff51de02be6 (diff)
downloadgit-59f0f2f33a420e9a14bb8cef20d38f508f0d098e.tar.gz
Refactor working tree setup
Create a setup_work_tree() that can be used from any command requiring a working tree conditionally. Signed-off-by: Mike Hommey <mh@glandium.org> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/git.c b/git.c
index 4e10581101..eb31c93d0f 100644
--- a/git.c
+++ b/git.c
@@ -249,14 +249,9 @@ static int run_command(struct cmd_struct *p, int argc, const char **argv)
prefix = setup_git_directory();
if (p->option & USE_PAGER)
setup_pager();
- if (p->option & NEED_WORK_TREE) {
- 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("%s must be run in a work tree", p->cmd);
- }
+ if (p->option & NEED_WORK_TREE)
+ setup_work_tree();
+
trace_argv_printf(argv, argc, "trace: built-in: git");
status = p->fn(argc, argv, prefix);