summaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-03 13:44:09 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-03 13:44:09 -0700
commita91af794bb4349e0b35d6a9615db31ae2f6ee355 (patch)
tree3d66ec6c07e60420b25e77b89125c93736023630 /builtin-read-tree.c
parent47781bf7793205cfb7b8ce89b9c3627ecf5480fc (diff)
downloadgit-a91af794bb4349e0b35d6a9615db31ae2f6ee355.tar.gz
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>
Diffstat (limited to 'builtin-read-tree.c')
-rw-r--r--builtin-read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 49c10bf221..b30160a5b3 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];