On Thu, Aug 03, 2006 at 07:06:20PM +0100, Robert Shearman wrote:
> It fails with a confusing message when you are in a subdirectory:
> rob@saturn:~/wine-git/dlls/msi$ git commit action.c
> usage: git-read-tree (<sha> | [[-m [--aggressive] | --reset |
> --prefix=<prefix>] [-u | -i]] <sha1> [<sha2> [<sha3>]])
The culprit is the recent changes to the builtins. cmd_read_tree now
takes an extra parameter 'prefix' which shadows the global declaration
in builtin-read-tree.c (and has a completely different meaning).
The one-liner below fixes it (though style-wise, you may prefer to rename the
shadowed variable).
-Peff
---
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 49c10bf..8e3b04e 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -870,7 +870,7 @@ static const char read_tree_usage[] = "g
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 *git_prefix)
{
int i, newfd, stage = 0;
unsigned char sha1[20];
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html