Skip to content

Commit

Permalink
builtin-blame: set up the work_tree before the first file access
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Nov 10, 2007
1 parent 2729cad commit 354e653
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions builtin-blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

setup_work_tree();
if (!has_path_in_work_tree(path))
die("cannot stat path %s: %s",
path, strerror(errno));
Expand Down
10 changes: 8 additions & 2 deletions setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,18 @@ static const char *set_work_tree(const char *dir)

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");
initialized = 1;
}

/*
Expand Down

0 comments on commit 354e653

Please sign in to comment.