Describe various forms of "be quiet" using OPT__QUIET

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 91fb9bfc624e3dc6556707e4a275c1d5543b5ce6..1ee30443074bbae67a402c5397b939a716f2a191 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -218,7 +218,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
                OPT_BOOLEAN('a', "all", &all,
                        "checks out all files in the index"),
                OPT__FORCE(&force, "forces overwrite of existing files"),
                OPT_BOOLEAN('a', "all", &all,
                        "checks out all files in the index"),
                OPT__FORCE(&force, "forces overwrite of existing files"),

-               OPT__QUIET(&quiet, "be quiet"),
+               OPT__QUIET(&quiet,
+                       "no warning for existing files and files not in index"),

                OPT_BOOLEAN('n', "no-create", &not_new,
                        "don't checkout new files"),
                { OPTION_CALLBACK, 'u', "index", &newfd, NULL,
                OPT_BOOLEAN('n', "no-create", &not_new,
                        "don't checkout new files"),
                { OPTION_CALLBACK, 'u', "index", &newfd, NULL,

diff --git a/builtin/checkout.c b/builtin/checkout.c
index f275570cbda0fe6fee85037ed0ec0c2500eafa7c..f9114de9a41c73c4ce032cbbbf305a3763258cc9 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -686,7 +686,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        int patch_mode = 0;
        int dwim_new_local_branch = 1;
        struct option options[] = {
        int patch_mode = 0;
        int dwim_new_local_branch = 1;
        struct option options[] = {

-               OPT__QUIET(&opts.quiet, "be quiet"),
+               OPT__QUIET(&opts.quiet, "suppress progress reporting"),

                OPT_STRING('b', NULL, &opts.new_branch, "branch",
                           "create and checkout a new branch"),
                OPT_STRING('B', NULL, &opts.new_branch_force, "branch",
                OPT_STRING('b', NULL, &opts.new_branch, "branch",
                           "create and checkout a new branch"),
                OPT_STRING('B', NULL, &opts.new_branch_force, "branch",

diff --git a/builtin/clean.c b/builtin/clean.c
index 9146bf3c1c70d306aab59812ea12f3a4d5fa7293..5e47c53cdb9c775c0de6d61421553fae9167b984 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -48,7 +48,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        const char *qname;
        char *seen = NULL;
        struct option options[] = {
        const char *qname;
        char *seen = NULL;
        struct option options[] = {

-               OPT__QUIET(&quiet, "be quiet"),
+               OPT__QUIET(&quiet, "do not print names of files removed"),

                OPT__DRY_RUN(&show_only, "dry run"),
                OPT__FORCE(&force, "force"),
                OPT_BOOLEAN('d', NULL, &remove_directories,
                OPT__DRY_RUN(&show_only, "dry run"),
                OPT__FORCE(&force, "force"),
                OPT_BOOLEAN('d', NULL, &remove_directories,

diff --git a/builtin/commit.c b/builtin/commit.c
index 97ae1bca4bff3cf6ef08b7f54be1ee901a5e0c1f..4fd1a1692f867e54eddd406d505e584ee0451cf8 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -114,8 +114,8 @@ static int opt_parse_m(const struct option *opt, const char *arg, int unset)
 }
 
 static struct option builtin_commit_options[] = {
 }
 
 static struct option builtin_commit_options[] = {

-       OPT__QUIET(&quiet, "be quiet"),
-       OPT__VERBOSE(&verbose, "be verbose"),
+       OPT__QUIET(&quiet, "suppress summary after successful commit"),
+       OPT__VERBOSE(&verbose, "show diff in commit message template"),

 
        OPT_GROUP("Commit message options"),
        OPT_FILENAME('F', "file", &logfile, "read log from file"),
 
        OPT_GROUP("Commit message options"),
        OPT_FILENAME('F', "file", &logfile, "read log from file"),

diff --git a/builtin/gc.c b/builtin/gc.c
index 8f673253708c9d5de42e02c381ec4cc75fb10a0b..397a1e6eb3ae8ec0e367a8faa2ca823586d26e6a 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -180,7 +180,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
        char buf[80];
 
        struct option builtin_gc_options[] = {
        char buf[80];
 
        struct option builtin_gc_options[] = {

-               OPT__QUIET(&quiet, "be quiet"),
+               OPT__QUIET(&quiet, "suppress progress reporting"),

                { OPTION_STRING, 0, "prune", &prune_expire, "date",
                        "prune unreferenced objects",
                        PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
                { OPTION_STRING, 0, "prune", &prune_expire, "date",
                        "prune unreferenced objects",
                        PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 58e473141c1828b81957332bea4e13132c00f686..9d75ed42c275bf292f88731021c9372ca23a8d10 100644 (file)
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -39,7 +39,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
                            XDL_MERGE_FAVOR_UNION),
                OPT_INTEGER(0, "marker-size", &xmp.marker_size,
                            "for conflicts, use this marker size"),
                            XDL_MERGE_FAVOR_UNION),
                OPT_INTEGER(0, "marker-size", &xmp.marker_size,
                            "for conflicts, use this marker size"),

-               OPT__QUIET(&quiet, "be quiet"),
+               OPT__QUIET(&quiet, "do not warn about conflicts"),

                OPT_CALLBACK('L', NULL, names, "name",
                             "set labels for file1/orig_file/file2", &label_cb),
                OPT_END(),
                OPT_CALLBACK('L', NULL, names, "name",
                             "set labels for file1/orig_file/file2", &label_cb),
                OPT_END(),

diff --git a/builtin/reset.c b/builtin/reset.c
index d6242071ba7a81f83c59e40d026e578b051ea3ba..5de2bceeec8c1d243ed6da70464d0c4dd60d7352 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -243,7 +243,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
        struct commit *commit;
        char *reflog_action, msg[1024];
        const struct option options[] = {
        struct commit *commit;
        char *reflog_action, msg[1024];
        const struct option options[] = {

-               OPT__QUIET(&quiet, "be quiet"),
+               OPT__QUIET(&quiet, "be quiet, only report errors"),

                OPT_SET_INT(0, "mixed", &reset_type,
                                                "reset HEAD and index", MIXED),
                OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),
                OPT_SET_INT(0, "mixed", &reset_type,
                                                "reset HEAD and index", MIXED),
                OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),

diff --git a/builtin/rm.c b/builtin/rm.c
index 9a5990513ab78a7c32cffdbe8b36b20c2509627e..c7b7bb37a2378aaeeddbbdfacd0f0a62337ec152 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -140,7 +140,7 @@ static int ignore_unmatch = 0;
 
 static struct option builtin_rm_options[] = {
        OPT__DRY_RUN(&show_only, "dry run"),
 
 static struct option builtin_rm_options[] = {
        OPT__DRY_RUN(&show_only, "dry run"),

-       OPT__QUIET(&quiet, "be quiet"),
+       OPT__QUIET(&quiet, "do not list removed files"),

        OPT_BOOLEAN( 0 , "cached",         &index_only, "only remove from the index"),
        OPT__FORCE(&force, "override the up-to-date check"),
        OPT_BOOLEAN('r', NULL,             &recursive,  "allow recursive removal"),
        OPT_BOOLEAN( 0 , "cached",         &index_only, "only remove from the index"),
        OPT__FORCE(&force, "override the up-to-date check"),
        OPT_BOOLEAN('r', NULL,             &recursive,  "allow recursive removal"),

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6507f03d32a97efab7d073f68c0e65f10a2857c4..45f0340c3ea004822477ed70fdd14e05dfcd9bb5 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -193,7 +193,8 @@ static const struct option show_ref_options[] = {
          "only show SHA1 hash using <n> digits",
          PARSE_OPT_OPTARG, &hash_callback },
        OPT__ABBREV(&abbrev),
          "only show SHA1 hash using <n> digits",
          PARSE_OPT_OPTARG, &hash_callback },
        OPT__ABBREV(&abbrev),

-       OPT__QUIET(&quiet, "be quiet"),
+       OPT__QUIET(&quiet,
+                  "do not print results to stdout (useful with --verify)"),

        { OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg,
          "pattern", "show refs from stdin that aren't in local repository",
          PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback },
        { OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg,
          "pattern", "show refs from stdin that aren't in local repository",
          PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback },

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 1b284253f2bfcf608548d9f7ab19c82ac356e24e..dea849c3c5ec0c0a7ee0ac98e1ae62a6dacf5806 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -30,7 +30,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
        int quiet = 0;
        const char *msg = NULL;
        struct option options[] = {
        int quiet = 0;
        const char *msg = NULL;
        struct option options[] = {

-               OPT__QUIET(&quiet, "be quiet"),
+               OPT__QUIET(&quiet,
+                       "suppress error message for non-symbolic (detached) refs"),

                OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
                OPT_END(),
        };
                OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
                OPT_END(),
        };