diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
commit | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch) | |
tree | e0595e44fc820032fd5ee942a031439f2e6da3b1 /builtin-check-ref-format.c | |
parent | ac64a722072bb348476a8a029de9a82073e07fba (diff) | |
parent | a633fca0c056aa221d23493c276d3713191621b3 (diff) | |
download | git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz |
Merge branch 'lt/setup' into __/setup-n-mv
This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-check-ref-format.c')
-rw-r--r-- | builtin-check-ref-format.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c index 4a23936aff..701de439ae 100644 --- a/builtin-check-ref-format.c +++ b/builtin-check-ref-format.c @@ -6,7 +6,7 @@ #include "refs.h" #include "builtin.h" -int cmd_check_ref_format(int argc, const char **argv, char **envp) +int cmd_check_ref_format(int argc, const char **argv, const char *prefix) { if (argc != 2) usage("git check-ref-format refname"); |