Merge refs/heads/master from .

diff --git a/read-tree.c b/read-tree.c
index 0d5ded5026c0a87987938c498e271c1d8cce122c..ce2bb88f0aae8919f188a0dbc5f3338523151740 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -17,7 +17,7 @@ static int unpack_tree(unsigned char *sha1)
        buffer = read_object_with_reference(sha1, "tree", &size, NULL);
        if (!buffer)
                return -1;
-       ret = read_tree(buffer, size, stage);
+       ret = read_tree(buffer, size, stage, NULL);
        free(buffer);
        return ret;
 }
@@ -510,7 +510,7 @@ static int read_cache_unmerged(void)
        return deleted;
 }
 
-static char *read_tree_usage = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
 
 static struct cache_file cache_file;