read-tree: shadowed variable fix.

Recent changes to built-ins broke committing from subdirectory,
because the unused parameter "prefix" shadowed a global variable.

Spotted by Jeff King.

Signed-off-by: Junio C Hamano <redacted>

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 49c10bf221961363b1edd073c926fe1bf92880c8..b30160a5b36c3a2cd2cf941728dc4c3d6e76c36d 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, 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];