user-manual: update for new default --track behavior

[git.git] / git.c

diff --git a/git.c b/git.c
index 7a788b9cfcf39bf714f67243132e73cee68da318..25b8274d3ea49b5d9155f35e945122f579ea438d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -272,9 +272,14 @@ 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) &&
-           (!is_inside_work_tree() || is_inside_git_dir()))
-               die("%s must be run in a work tree", p->cmd);
+       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);
+       }
        trace_argv_printf(argv, argc, "trace: built-in: git");
 
        status = p->fn(argc, argv, prefix);