[PATCH] init-db: use OPT__QUIET macro instead OPT_BIT
- From
Alexander Kuleshov <kuleshovmail@gmail.com>
- Date
- Jan 14, 2015, 17:32 UTC
- Message-ID
- <1421256762-26765-1-git-send-email-kuleshovmail@gmail.com>
There is OPT__QUIET macro for easily -q/--quiet option defenition, let's use it instead OPT_BIT
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> --- builtin/init-db.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index 280454a..a89343b 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -368,7 +368,7 @@ static void separate_git_dir(const char *git_dir) write_file(git_link, 1, "gitdir: %s\n", git_dir); } -int init_db(const char *template_dir, unsigned int flags) +int init_db(const char *template_dir, unsigned int quiet) { int reinit; const char *git_dir = get_git_dir(); @@ -411,8 +411,7 @@ int init_db(const char *template_dir, unsigned int flags) git_config_set("core.sharedrepository", buf); git_config_set("receive.denyNonFastforwards", "true"); } - if (!(flags & INIT_DB_QUIET)) { + if (!(quiet & INIT_DB_QUIET)) { int len = strlen(git_dir); /* TRANSLATORS: The first '%s' is either "Reinitialized @@ -483,7 +482,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) const char *real_git_dir = NULL; const char *work_tree; const char *template_dir = NULL; - unsigned int flags = 0; + unsigned int quiet = 0; const struct option init_db_options[] = { OPT_STRING(0, "template", &template_dir, N_("template-directory"), N_("directory from which templates will be used")), @@ -493,7 +492,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) N_("permissions"), N_("specify that the git repository is to be shared amongst several users"), PARSE_OPT_OPTARG | PARSE_OPT_NONEG, shared_callback, 0}, - OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET), + OPT__QUIET(&quiet, N_("suppress progress reporting")), OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), N_("separate git dir from working tree")), OPT_END() @@ -593,5 +592,5 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) set_git_dir_init(git_dir, real_git_dir, 1); - return init_db(template_dir, flags); + return init_db(template_dir, quiet); }
-- 2.3.0.rc0.256.g17f147e