Merge branch 'lt/web'

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 122b6f130b37b27055efd7dffa25f41ef03698e8..71a7026df4bec244acdf36ef9559eecc5b65fae3 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -870,7 +870,7 @@ static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive
 
 static struct lock_file lock_file;
 
-int cmd_read_tree(int argc, const char **argv, char **envp)
+int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 {
        int i, newfd, stage = 0;
        unsigned char sha1[20];
@@ -882,12 +882,9 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
        state.quiet = 1;
        state.refresh_cache = 1;
 
-       setup_git_directory();
        git_config(git_default_config);
 
-       newfd = hold_lock_file_for_update(&lock_file, get_index_file());
-       if (newfd < 0)
-               die("unable to create new index file");
+       newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
 
        git_config(git_default_config);