builtin-blame: set up the work_tree before the first file access

We check in cmd_blame() if the specified path is there, but we
failed to set up the working tree before that.

While at it, make setup_work_tree() just return if it was run
before.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-blame.c b/builtin-blame.c
index 55a3c0bc5e3aa9c893468f5f97eab17681ddc673..ba80bf8942f1db42b8a132471ddbfc38e565f115 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2295,6 +2295,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                        else if (i != argc - 1)
                                usage(blame_usage); /* garbage at end */
 
                        else if (i != argc - 1)
                                usage(blame_usage); /* garbage at end */
 

+                       setup_work_tree();

                        if (!has_path_in_work_tree(path))
                                die("cannot stat path %s: %s",
                                    path, strerror(errno));
                        if (!has_path_in_work_tree(path))
                                die("cannot stat path %s: %s",
                                    path, strerror(errno));

diff --git a/setup.c b/setup.c
index 1e2c55d0767dfc1122e0c6716f9148bd10be22ab..43cd3f94ea31a7a2a8f8a07cbb67598bb1e52c39 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -208,12 +208,18 @@ static const char *set_work_tree(const char *dir)
 
 void setup_work_tree(void)
 {
 
 void setup_work_tree(void)
 {

-       const char *work_tree = get_git_work_tree();
-       const char *git_dir = get_git_dir();
+       const char *work_tree, *git_dir;
+       static int initialized = 0;
+
+       if (initialized)
+               return;
+       work_tree = get_git_work_tree();
+       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");
        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");

+       initialized = 1;

 }
 
 /*
 }
 
 /*