Merge branch 'maint'

diff --git a/builtin-init-db.c b/builtin-init-db.c
index 7fdd2fa9f9f7fb2801c6e1fc398f78b414a269e1..5085018e46d8ebefaf797d62dcc7c9f8f1d06d02 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -250,7 +250,7 @@ static const char init_db_usage[] =
  * On the other hand, it might just make lookup slower and messier. You
  * be the judge.  The default case is to have one DB per managed directory.
  */
-int cmd_init_db(int argc, const char **argv, char **envp)
+int cmd_init_db(int argc, const char **argv, const char *prefix)
 {
        const char *git_dir;
        const char *sha1_dir;
@@ -267,7 +267,7 @@ int cmd_init_db(int argc, const char **argv, char **envp)
                else if (!strncmp(arg, "--shared=", 9))
                        shared_repository = git_config_perm("arg", arg+9);
                else
-                       die(init_db_usage);
+                       usage(init_db_usage);
        }
 
        /*