From: Junio C Hamano <junkio@cox.net>
Date: Thu, 3 Aug 2006 20:44:09 +0000 (-0700)
Subject: read-tree: shadowed variable fix.
X-Git-Tag: v1.4.2-rc3~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a91af794bb4349e0b35d6a9615db31ae2f6ee355;p=git.git

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 <junkio@cox.net>
---

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 49c10bf22..b30160a5b 100644
--- 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];