Merge branch 'js/read-tree'

[thirdparty/git.git] / builtin-read-tree.c

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 8869cedea1f9b07d78520858876cca614283d01b..8da8acbb0a25f88073254e21936a6ad5c6d0cca4 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -88,7 +88,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, const char *prefix)
+int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 {
        int i, newfd, stage = 0;
        unsigned char sha1[20];
@@ -100,9 +100,7 @@ int cmd_read_tree(int argc, const char **argv, const char *prefix)
        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);