builtin/*: update usage format
PATCH 1/1 builtin/*: update usage format
From: ZheNing Hu <[email protected]>
According to the "Error Messages" section of Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
Signed-off-by ZheNing Hu <[email protected]>
---
builtin/*: update usage format
According to the "Error Messages" section of Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
Signed-off-by adl [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-822%2Fadlternative%2Fdev-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-822/adlternative/dev-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/822
builtin/am.c | 4 ++-- builtin/blame.c | 48 ++++++++++++++++++------------------- builtin/commit-graph.c | 6 ++--- builtin/fast-export.c | 22 ++++++++--------- builtin/log.c | 8 +++---- builtin/shortlog.c | 10 ++++---- builtin/submodule--helper.c | 24 +++++++++---------- 7 files changed, 61 insertions(+), 61 deletions(-)
builtin/am.c +2 -2
@@ -2284,10 +2284,10 @@ int cmd_am(int argc, const char **argv, const char *prefix) N_("skip the current patch"), RESUME_SKIP),OPT_CMDMODE (0 ,"abort" , &resume.mode, -N_ ("restore the original branch and abort the patching operation." ), +N_ ("restore the original branch and abort the patching operation" ),RESUME_ABORT ),OPT_CMDMODE (0 ,"quit" , &resume.mode, -N_ ("abort the patching operation but keep HEAD where it is." ), +N_ ("abort the patching operation but keep HEAD where it is" ),RESUME_QUIT ), { OPTION_CALLBACK, 0, "show-current-patch", &resume.mode, "(diff|raw)",
builtin/blame.c +24 -24
57 lines not on this page · raw message
builtin/commit-graph.c +3 -3
@@ -78,7 +78,7 @@ static int graph_verify(int argc, const char **argv)static struct option builtin_commit_graph_verify_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_BOOL (0 ,"shallow" , &opts.shallow,N_ ("if the commit-graph is split, only verify the tip file" )),OPT_BOOL (0 ,"progress" , &opts.progress,N_ ("force progress reporting" )),
@@ -208,7 +208,7 @@ static int graph_write(int argc, const char **argv)static struct option builtin_commit_graph_write_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_BOOL (0 ,"reachable" , &opts.reachable,N_ ("start walk at all refs" )), OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -314,7 +314,7 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)static struct option builtin_commit_graph_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_END (), };
builtin/fast-export.c +11 -11
@@ -1205,32 +1205,32 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) N_("select handling of commit messages in an alternate encoding"), parse_opt_reencode_mode),OPT_STRING (0 ,"export-marks" , &export_filename,N_ ("file" ), -N_ ("Dump marks to this file" )), +N_ ("dump marks to this file" )),OPT_STRING (0 ,"import-marks" , &import_filename,N_ ("file" ), -N_ ("Import marks from this file" )), +N_ ("import marks from this file" )),OPT_STRING (0 ,"import-marks-if-exists" , &import_filename_if_exists,N_ ("file" ), -N_ ("Import marks from this file if it exists" )), +N_ ("import marks from this file if it exists" )),OPT_BOOL (0 ,"fake-missing-tagger" , &fake_missing_tagger, -N_ ("Fake a tagger when tags lack one" )), +N_ ("fake a tagger when tags lack one" )),OPT_BOOL (0 ,"full-tree" , &full_tree, -N_ ("Output full tree for each commit" )), +N_ ("output full tree for each commit" )),OPT_BOOL (0 ,"use-done-feature" , &use_done_feature, -N_ ("Use the done feature to terminate the stream" )), -OPT_BOOL (0 ,"no-data" , &no_data,N_ ("Skip output of blob data" )), +N_ ("use the done feature to terminate the stream" )), +OPT_BOOL (0 ,"no-data" , &no_data,N_ ("skip output of blob data" )),OPT_STRING_LIST (0 ,"refspec" , &refspecs_list,N_ ("refspec" ), -N_ ("Apply refspec to exported refs" )), +N_ ("apply refspec to exported refs" )),OPT_BOOL (0 ,"anonymize" , &anonymize,N_ ("anonymize output" )),OPT_CALLBACK_F (0 ,"anonymize-map" , &anonymized_seeds,N_ ("from:to" ),N_ ("convert <from> to <to> in anonymized output" ),PARSE_OPT_NONEG , parse_opt_anonymize_map),OPT_BOOL (0 ,"reference-excluded-parents" , - &reference_excluded_commits,N_ ("Reference parents which are not in fast-export stream by object id" )), + &reference_excluded_commits,N_ ("reference parents which are not in fast-export stream by object id" )),OPT_BOOL (0 ,"show-original-ids" , &show_original_ids, -N_ ("Show original object ids of blobs/commits" )), +N_ ("show original object ids of blobs/commits" )),OPT_BOOL (0 ,"mark-tags" , &mark_tags, -N_ ("Label tags with mark ids" )), +N_ ("label tags with mark ids" )),OPT_END () };
builtin/log.c +4 -4
@@ -177,7 +177,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,const struct option builtin_log_options[] = {OPT__QUIET (&quiet,N_ ("suppress diff output" )),OPT_BOOL (0 ,"source" , &source,N_ ("show source" )), -OPT_BOOL (0 ,"use-mailmap" , &mailmap,N_ ("Use mail map file" )), +OPT_BOOL (0 ,"use-mailmap" , &mailmap,N_ ("use mail map file" )),OPT_ALIAS (0 ,"mailmap" ,"use-mailmap" ),OPT_STRING_LIST (0 ,"decorate-refs" , &decorate_refs_include,N_ ("pattern" ),N_ ("only decorate refs that match <pattern>" )),
@@ -186,7 +186,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,OPT_CALLBACK_F (0 ,"decorate" ,NULL ,NULL ,N_ ("decorate options" ),PARSE_OPT_OPTARG , decorate_callback),OPT_CALLBACK ('L' ,NULL , &line_cb,"range:file" , -N_ ("Trace the evolution of line range <start>,<end> or function :<funcname> in <file>" ), +N_ ("trace the evolution of line range <start>,<end> or function :<funcname> in <file>" ), log_line_range_callback), OPT_END() };
@@ -1757,13 +1757,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)OPT_INTEGER (0 ,"filename-max-length" , &fmt_patch_name_max,N_ ("max length of output filename" )),OPT_CALLBACK_F (0 ,"rfc" , &rev,NULL , -N_ ("Use [RFC PATCH] instead of [PATCH]" ), +N_ ("use [RFC PATCH] instead of [PATCH]" ),PARSE_OPT_NOARG |PARSE_OPT_NONEG , rfc_callback),OPT_STRING (0 ,"cover-from-description" , &cover_from_description_arg,N_ ("cover-from-description-mode" ),N_ ("generate parts of a cover letter based on a branch's description" )),OPT_CALLBACK_F (0 ,"subject-prefix" , &rev,N_ ("prefix" ), -N_ ("Use [<prefix>] instead of [PATCH]" ), +N_ ("use [<prefix>] instead of [PATCH]" ),PARSE_OPT_NONEG , subject_prefix_callback), OPT_CALLBACK_F('o', "output-directory", &output_directory, N_("dir"), N_("store resulting files in <dir>"),
builtin/shortlog.c +5 -5
@@ -360,19 +360,19 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)const struct option options[] = {OPT_BIT ('c' ,"committer" , &log.groups, -N_ ("Group by committer rather than author" ), +N_ ("group by committer rather than author" ),SHORTLOG_GROUP_COMMITTER ),OPT_BOOL ('n' ,"numbered" , &log.sort_by_number,N_ ("sort output according to the number of commits per author" )),OPT_BOOL ('s' ,"summary" , &log.summary, -N_ ("Suppress commit descriptions, only provides commit count" )), +N_ ("suppress commit descriptions, only provides commit count" )),OPT_BOOL ('e' ,"email" , &log.email, -N_ ("Show the email address of each author" )), +N_ ("show the email address of each author" )),OPT_CALLBACK_F ('w' ,NULL , &log,N_ ("<w>[,<i1>[,<i2>]]" ), -N_ ("Linewrap output" ),PARSE_OPT_OPTARG , +N_ ("linewrap output" ),PARSE_OPT_OPTARG , &parse_wrap_args),OPT_CALLBACK (0 ,"group" , &log,N_ ("field" ), -N_ ("Group by field" ), parse_group_option), +N_ ("group by field" ), parse_group_option),OPT_END (), };
builtin/submodule--helper.c +12 -12
@@ -562,9 +562,9 @@ static int module_foreach(int argc, const char **argv, const char *prefix)struct module_list list =MODULE_LIST_INIT ;struct option module_foreach_options[] = { -OPT__QUIET (&info.quiet,N_ ("Suppress output of entering each submodule command" )), +OPT__QUIET (&info.quiet,N_ ("suppress output of entering each submodule command" )),OPT_BOOL (0 ,"recursive" , &info.recursive, -N_ ("Recurse into nested submodules" )), +N_ ("recurse into nested submodules" )),OPT_END () };
@@ -706,7 +706,7 @@ static int module_init(int argc, const char **argv, const char *prefix)int quiet =0 ;struct option module_init_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output for initializing a submodule" )), +OPT__QUIET (&quiet,N_ ("suppress output for initializing a submodule" )),OPT_END () };
@@ -883,8 +883,8 @@ static int module_status(int argc, const char **argv, const char *prefix)int quiet =0 ;struct option module_status_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress submodule status output" )), -OPT_BIT (0 ,"cached" , &info.flags,N_ ("Use commit stored in the index instead of the one stored in the submodule HEAD" ),OPT_CACHED ), +OPT__QUIET (&quiet,N_ ("suppress submodule status output" )), +OPT_BIT (0 ,"cached" , &info.flags,N_ ("use commit stored in the index instead of the one stored in the submodule HEAD" ),OPT_CACHED ),OPT_BIT (0 ,"recursive" , &info.flags,N_ ("recurse into nested submodules" ),OPT_RECURSIVE ),OPT_END () };
@@ -1482,9 +1482,9 @@ static int module_sync(int argc, const char **argv, const char *prefix)int recursive =0 ;struct option module_sync_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output of synchronizing submodule url" )), +OPT__QUIET (&quiet,N_ ("suppress output of synchronizing submodule url" )),OPT_BOOL (0 ,"recursive" , &recursive, -N_ ("Recurse into nested submodules" )), +N_ ("recurse into nested submodules" )),OPT_END () };
@@ -1620,9 +1620,9 @@ static int module_deinit(int argc, const char **argv, const char *prefix)int all =0 ;struct option module_deinit_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress submodule status output" )), -OPT__FORCE (&force,N_ ("Remove submodule working trees even if they contain local changes" ),0 ), -OPT_BOOL (0 ,"all" , &all,N_ ("Unregister all submodules" )), +OPT__QUIET (&quiet,N_ ("suppress submodule status output" )), +OPT__FORCE (&force,N_ ("remove submodule working trees even if they contain local changes" ),0 ), +OPT_BOOL (0 ,"all" , &all,N_ ("unregister all submodules" )),OPT_END () };
@@ -2337,7 +2337,7 @@ static int update_clone(int argc, const char **argv, const char *prefix)OPT_BOOL (0 ,"dissociate" , &suc.dissociate,N_ ("use --reference only while cloning" )),OPT_STRING (0 ,"depth" , &suc.depth,"<depth>" , -N_ ("Create a shallow clone truncated to the " +N_ ("create a shallow clone truncated to the " "specified number of revisions" )),OPT_INTEGER ('j' ,"jobs" , &suc.max_jobs, N_("parallel jobs")),
@@ -2678,7 +2678,7 @@ static int module_set_url(int argc, const char **argv, const char *prefix)char *config_name;struct option options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output for setting url of a submodule" )), +OPT__QUIET (&quiet,N_ ("suppress output for setting url of a submodule" )),OPT_END () };const char *const usage[] = {
base-commit: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
Signature · 1 line
gitgitgadget
Quoted 6 lines · 阿德烈 via GitGitGadget
From: ZheNing Hu <[email protected]>
According to the "Error Messages" section of
Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
I agree this consistency is good.
The only time where you need capital letters and full stops is when there's multiple sentences.
Signature · 1 line
Felipe Contreras
Re* [PATCH] builtin/*: update usage format
In reply to 阿德烈 via GitGitGadgetQuoted 5 lines · 阿德烈 via GitGitGadget
From: ZheNing Hu <[email protected]>
According to the "Error Messages" section of
Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter.
Yup, error("message"), die("message") and warn("messages") lack the final full stop and starts with lowercase.
Review
Quoted 4 lines
(quoted diff) +1
-1OPT_CMDMODE(0, "abort", &resume.mode, - N_("restore the original branch and abort the patching operation."), + N_("restore the original branch and abort the patching operation"), RESUME_ABORT),
But is this an error message? I do not think so.
Review
Quoted 6 lines
...
(quoted diff) +1
-1struct option options[] = { - OPT__QUIET(&quiet, N_("Suppress output for setting url of a submodule")), + OPT__QUIET(&quiet, N_("suppress output for setting url of a submodule")), OPT_END() };
Having said that, I do not *mimd* standardising the usage help strings in the same way. I do not think the "Error Messages" section is the one we want to use for the justification of this patch.
Perhaps a preparatory patch like the attached would be a good way forward? I dunno.
---- >8 -------- >8 -------- >8 -------- >8 -------- >8 ----
Subject: parse-options: format argh like error messages
"Keep it homogeneous across the repository" is in general a guideline that can be used to converge to a good practice, but we can be a bit more prescriptive in this case. Just like the messages we give die(_("...")) are formatted without the final full stop and without the initial capitalization, most of the argument help text are already formatted that way, and we want to encourage that as the house style.
Noticed-by ZheNing Hu <[email protected]>
Signed-off-by Junio C Hamano <[email protected]>
--- parse-options.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
parse-options.h +3 -3
@@ -82,9 +82,9 @@ typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,* stores pointers to the values to be filled. * * `argh`:: -* token to explain the kind of argument this option wants. Keep it -* homogeneous across the repository. Should be wrapped by N_() for -* translation. +* token to explain the kind of argument this option wants. Does not +* begin in capital letter, and does not end with a full stop. +* Should be wrapped by N_() for translation. * * `help`:: * the short help associated to what the option does.
Re: Re* [PATCH] builtin/*: update usage format
Quoted 9 lines · Junio C Hamano
Subject: parse-options: format argh like error messages
"Keep it homogeneous across the repository" is in general a guideline that can be used to converge to a good practice, but we can be a bit more prescriptive in this case. Just like the messages we give die(_("...")) are formatted without the final full stop and without the initial capitalization, most of the argument help text are already formatted that way, and we want to encourage that as the house style.
It's tough to "keep it homogeneous" when the repository isn't already in that state. Thanks, ZheNing, for working to improve that situation.
Quoted 7 lines
*
argh::- * token to explain the kind of argument this option wants. Keep it - * homogeneous across the repository. Should be wrapped by N_() for - * translation. + * token to explain the kind of argument this option wants. Does not + * begin in capital letter, and does not end with a full stop. + * Should be wrapped by N_() for translation.
I think this more-specific language is helpful.
Thanks,
-Stolee
v2 cover builtin/*: update usage format
In reply to 阿德烈 via GitGitGadgetAccording to the "Error Messages" section of Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
Signed-off-by adl [email protected]
Junio C Hamano (1):
parse-options: format argh like error messages
ZheNing Hu (1):
builtin/*: update usage format
builtin/am.c | 4 ++-- builtin/blame.c | 48 ++++++++++++++++++------------------- builtin/commit-graph.c | 6 ++--- builtin/fast-export.c | 22 ++++++++--------- builtin/log.c | 8 +++---- builtin/shortlog.c | 10 ++++---- builtin/submodule--helper.c | 24 +++++++++---------- parse-options.h | 6 ++--- 8 files changed, 64 insertions(+), 64 deletions(-)
base-commit: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-822%2Fadlternative%2Fdev-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-822/adlternative/dev-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/822
Range-diff vs v1:
1: 52f7c8457dd = 1: 52f7c8457dd builtin/*: update usage format -: ----------- > 2: c5f01b0eab1 parse-options: format argh like error messages
Signature · 1 line
gitgitgadget
PATCH v2 1/2 builtin/*: update usage format
From: ZheNing Hu <[email protected]>
According to the "Error Messages" section of Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
Signed-off-by ZheNing Hu <[email protected]>
--- builtin/am.c | 4 ++-- builtin/blame.c | 48 ++++++++++++++++++------------------- builtin/commit-graph.c | 6 ++--- builtin/fast-export.c | 22 ++++++++--------- builtin/log.c | 8 +++---- builtin/shortlog.c | 10 ++++---- builtin/submodule--helper.c | 24 +++++++++---------- 7 files changed, 61 insertions(+), 61 deletions(-)
builtin/am.c +2 -2
@@ -2284,10 +2284,10 @@ int cmd_am(int argc, const char **argv, const char *prefix) N_("skip the current patch"), RESUME_SKIP),OPT_CMDMODE (0 ,"abort" , &resume.mode, -N_ ("restore the original branch and abort the patching operation." ), +N_ ("restore the original branch and abort the patching operation" ),RESUME_ABORT ),OPT_CMDMODE (0 ,"quit" , &resume.mode, -N_ ("abort the patching operation but keep HEAD where it is." ), +N_ ("abort the patching operation but keep HEAD where it is" ),RESUME_QUIT ), { OPTION_CALLBACK, 0, "show-current-patch", &resume.mode, "(diff|raw)",
builtin/blame.c +24 -24
57 lines not on this page · raw message
builtin/commit-graph.c +3 -3
@@ -78,7 +78,7 @@ static int graph_verify(int argc, const char **argv)static struct option builtin_commit_graph_verify_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_BOOL (0 ,"shallow" , &opts.shallow,N_ ("if the commit-graph is split, only verify the tip file" )),OPT_BOOL (0 ,"progress" , &opts.progress,N_ ("force progress reporting" )),
@@ -208,7 +208,7 @@ static int graph_write(int argc, const char **argv)static struct option builtin_commit_graph_write_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_BOOL (0 ,"reachable" , &opts.reachable,N_ ("start walk at all refs" )), OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -314,7 +314,7 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)static struct option builtin_commit_graph_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_END (), };
builtin/fast-export.c +11 -11
@@ -1205,32 +1205,32 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) N_("select handling of commit messages in an alternate encoding"), parse_opt_reencode_mode),OPT_STRING (0 ,"export-marks" , &export_filename,N_ ("file" ), -N_ ("Dump marks to this file" )), +N_ ("dump marks to this file" )),OPT_STRING (0 ,"import-marks" , &import_filename,N_ ("file" ), -N_ ("Import marks from this file" )), +N_ ("import marks from this file" )),OPT_STRING (0 ,"import-marks-if-exists" , &import_filename_if_exists,N_ ("file" ), -N_ ("Import marks from this file if it exists" )), +N_ ("import marks from this file if it exists" )),OPT_BOOL (0 ,"fake-missing-tagger" , &fake_missing_tagger, -N_ ("Fake a tagger when tags lack one" )), +N_ ("fake a tagger when tags lack one" )),OPT_BOOL (0 ,"full-tree" , &full_tree, -N_ ("Output full tree for each commit" )), +N_ ("output full tree for each commit" )),OPT_BOOL (0 ,"use-done-feature" , &use_done_feature, -N_ ("Use the done feature to terminate the stream" )), -OPT_BOOL (0 ,"no-data" , &no_data,N_ ("Skip output of blob data" )), +N_ ("use the done feature to terminate the stream" )), +OPT_BOOL (0 ,"no-data" , &no_data,N_ ("skip output of blob data" )),OPT_STRING_LIST (0 ,"refspec" , &refspecs_list,N_ ("refspec" ), -N_ ("Apply refspec to exported refs" )), +N_ ("apply refspec to exported refs" )),OPT_BOOL (0 ,"anonymize" , &anonymize,N_ ("anonymize output" )),OPT_CALLBACK_F (0 ,"anonymize-map" , &anonymized_seeds,N_ ("from:to" ),N_ ("convert <from> to <to> in anonymized output" ),PARSE_OPT_NONEG , parse_opt_anonymize_map),OPT_BOOL (0 ,"reference-excluded-parents" , - &reference_excluded_commits,N_ ("Reference parents which are not in fast-export stream by object id" )), + &reference_excluded_commits,N_ ("reference parents which are not in fast-export stream by object id" )),OPT_BOOL (0 ,"show-original-ids" , &show_original_ids, -N_ ("Show original object ids of blobs/commits" )), +N_ ("show original object ids of blobs/commits" )),OPT_BOOL (0 ,"mark-tags" , &mark_tags, -N_ ("Label tags with mark ids" )), +N_ ("label tags with mark ids" )),OPT_END () };
builtin/log.c +4 -4
@@ -177,7 +177,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,const struct option builtin_log_options[] = {OPT__QUIET (&quiet,N_ ("suppress diff output" )),OPT_BOOL (0 ,"source" , &source,N_ ("show source" )), -OPT_BOOL (0 ,"use-mailmap" , &mailmap,N_ ("Use mail map file" )), +OPT_BOOL (0 ,"use-mailmap" , &mailmap,N_ ("use mail map file" )),OPT_ALIAS (0 ,"mailmap" ,"use-mailmap" ),OPT_STRING_LIST (0 ,"decorate-refs" , &decorate_refs_include,N_ ("pattern" ),N_ ("only decorate refs that match <pattern>" )),
@@ -186,7 +186,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,OPT_CALLBACK_F (0 ,"decorate" ,NULL ,NULL ,N_ ("decorate options" ),PARSE_OPT_OPTARG , decorate_callback),OPT_CALLBACK ('L' ,NULL , &line_cb,"range:file" , -N_ ("Trace the evolution of line range <start>,<end> or function :<funcname> in <file>" ), +N_ ("trace the evolution of line range <start>,<end> or function :<funcname> in <file>" ), log_line_range_callback), OPT_END() };
@@ -1757,13 +1757,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)OPT_INTEGER (0 ,"filename-max-length" , &fmt_patch_name_max,N_ ("max length of output filename" )),OPT_CALLBACK_F (0 ,"rfc" , &rev,NULL , -N_ ("Use [RFC PATCH] instead of [PATCH]" ), +N_ ("use [RFC PATCH] instead of [PATCH]" ),PARSE_OPT_NOARG |PARSE_OPT_NONEG , rfc_callback),OPT_STRING (0 ,"cover-from-description" , &cover_from_description_arg,N_ ("cover-from-description-mode" ),N_ ("generate parts of a cover letter based on a branch's description" )),OPT_CALLBACK_F (0 ,"subject-prefix" , &rev,N_ ("prefix" ), -N_ ("Use [<prefix>] instead of [PATCH]" ), +N_ ("use [<prefix>] instead of [PATCH]" ),PARSE_OPT_NONEG , subject_prefix_callback), OPT_CALLBACK_F('o', "output-directory", &output_directory, N_("dir"), N_("store resulting files in <dir>"),
builtin/shortlog.c +5 -5
@@ -360,19 +360,19 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)const struct option options[] = {OPT_BIT ('c' ,"committer" , &log.groups, -N_ ("Group by committer rather than author" ), +N_ ("group by committer rather than author" ),SHORTLOG_GROUP_COMMITTER ),OPT_BOOL ('n' ,"numbered" , &log.sort_by_number,N_ ("sort output according to the number of commits per author" )),OPT_BOOL ('s' ,"summary" , &log.summary, -N_ ("Suppress commit descriptions, only provides commit count" )), +N_ ("suppress commit descriptions, only provides commit count" )),OPT_BOOL ('e' ,"email" , &log.email, -N_ ("Show the email address of each author" )), +N_ ("show the email address of each author" )),OPT_CALLBACK_F ('w' ,NULL , &log,N_ ("<w>[,<i1>[,<i2>]]" ), -N_ ("Linewrap output" ),PARSE_OPT_OPTARG , +N_ ("linewrap output" ),PARSE_OPT_OPTARG , &parse_wrap_args),OPT_CALLBACK (0 ,"group" , &log,N_ ("field" ), -N_ ("Group by field" ), parse_group_option), +N_ ("group by field" ), parse_group_option),OPT_END (), };
builtin/submodule--helper.c +12 -12
@@ -562,9 +562,9 @@ static int module_foreach(int argc, const char **argv, const char *prefix)struct module_list list =MODULE_LIST_INIT ;struct option module_foreach_options[] = { -OPT__QUIET (&info.quiet,N_ ("Suppress output of entering each submodule command" )), +OPT__QUIET (&info.quiet,N_ ("suppress output of entering each submodule command" )),OPT_BOOL (0 ,"recursive" , &info.recursive, -N_ ("Recurse into nested submodules" )), +N_ ("recurse into nested submodules" )),OPT_END () };
@@ -706,7 +706,7 @@ static int module_init(int argc, const char **argv, const char *prefix)int quiet =0 ;struct option module_init_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output for initializing a submodule" )), +OPT__QUIET (&quiet,N_ ("suppress output for initializing a submodule" )),OPT_END () };
@@ -883,8 +883,8 @@ static int module_status(int argc, const char **argv, const char *prefix)int quiet =0 ;struct option module_status_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress submodule status output" )), -OPT_BIT (0 ,"cached" , &info.flags,N_ ("Use commit stored in the index instead of the one stored in the submodule HEAD" ),OPT_CACHED ), +OPT__QUIET (&quiet,N_ ("suppress submodule status output" )), +OPT_BIT (0 ,"cached" , &info.flags,N_ ("use commit stored in the index instead of the one stored in the submodule HEAD" ),OPT_CACHED ),OPT_BIT (0 ,"recursive" , &info.flags,N_ ("recurse into nested submodules" ),OPT_RECURSIVE ),OPT_END () };
@@ -1482,9 +1482,9 @@ static int module_sync(int argc, const char **argv, const char *prefix)int recursive =0 ;struct option module_sync_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output of synchronizing submodule url" )), +OPT__QUIET (&quiet,N_ ("suppress output of synchronizing submodule url" )),OPT_BOOL (0 ,"recursive" , &recursive, -N_ ("Recurse into nested submodules" )), +N_ ("recurse into nested submodules" )),OPT_END () };
@@ -1620,9 +1620,9 @@ static int module_deinit(int argc, const char **argv, const char *prefix)int all =0 ;struct option module_deinit_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress submodule status output" )), -OPT__FORCE (&force,N_ ("Remove submodule working trees even if they contain local changes" ),0 ), -OPT_BOOL (0 ,"all" , &all,N_ ("Unregister all submodules" )), +OPT__QUIET (&quiet,N_ ("suppress submodule status output" )), +OPT__FORCE (&force,N_ ("remove submodule working trees even if they contain local changes" ),0 ), +OPT_BOOL (0 ,"all" , &all,N_ ("unregister all submodules" )),OPT_END () };
@@ -2337,7 +2337,7 @@ static int update_clone(int argc, const char **argv, const char *prefix)OPT_BOOL (0 ,"dissociate" , &suc.dissociate,N_ ("use --reference only while cloning" )),OPT_STRING (0 ,"depth" , &suc.depth,"<depth>" , -N_ ("Create a shallow clone truncated to the " +N_ ("create a shallow clone truncated to the " "specified number of revisions" )),OPT_INTEGER ('j' ,"jobs" , &suc.max_jobs, N_("parallel jobs")),
@@ -2678,7 +2678,7 @@ static int module_set_url(int argc, const char **argv, const char *prefix)char *config_name;struct option options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output for setting url of a submodule" )), +OPT__QUIET (&quiet,N_ ("suppress output for setting url of a submodule" )),OPT_END () };const char *const usage[] = {
Signature · 1 line
gitgitgadget
PATCH v2 2/2 parse-options: format argh like error messages
In reply to 阿德烈 via GitGitGadgetFrom: Junio C Hamano <[email protected]>
"Keep it homogeneous across the repository" is in general a guideline that can be used to converge to a good practice, but we can be a bit more prescriptive in this case. Just like the messages we give die(_("...")) are formatted without the final full stop and without the initial capitalization, most of the argument help text are already formatted that way, and we want to encourage that as the house style.
Noticed-by ZheNing Hu <[email protected]>
Signed-off-by Junio C Hamano <[email protected]>
--- parse-options.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
parse-options.h +3 -3
@@ -82,9 +82,9 @@ typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,* stores pointers to the values to be filled. * * `argh`:: -* token to explain the kind of argument this option wants. Keep it -* homogeneous across the repository. Should be wrapped by N_() for -* translation. +* token to explain the kind of argument this option wants. Does not +* begin in capital letter, and does not end with a full stop. +* Should be wrapped by N_() for translation. * * `help`:: * the short help associated to what the option does.
Signature · 1 line
gitgitgadget
Re: [PATCH v2 2/2] parse-options: format argh like error messages
Quoted 10 lines · Junio C Hamano via GitGitGadget
From: Junio C Hamano <[email protected]>
"Keep it homogeneous across the repository" is in general a guideline that can be used to converge to a good practice, but we can be a bit more prescriptive in this case. Just like the messages we give die(_("...")) are formatted without the final full stop and without the initial capitalization, most of the argument help text are already formatted that way, and we want to encourage that as the house style.
Quoted 2 lines
Noticed-by ZheNing Hu <[email protected]>Signed-off-by Junio C Hamano <[email protected]>
ZheNing,
It is certainly a common thing to pull patches from other contributors into your own series. However, you'll need to add your own sign-off at the end.
I also believe that the intention was that this patch would come before the other, so please swap the patches. Then, you can update the message in the other patch from
According to the "Error Messages" section of Documentation/CodingGuidelines,
to
According to the guidelines in parse-options.h,
Thanks,
-Stolee
v3 cover builtin/*: update usage format
In reply to 阿德烈 via GitGitGadgetAccording to the "Error Messages" section of Documentation/CodingGuidelines, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
Signed-off-by adl [email protected]
Junio C Hamano (1):
parse-options: format argh like error messages
ZheNing Hu (1):
builtin/*: update usage format
builtin/am.c | 4 ++-- builtin/blame.c | 48 ++++++++++++++++++------------------- builtin/commit-graph.c | 6 ++--- builtin/fast-export.c | 22 ++++++++--------- builtin/log.c | 8 +++---- builtin/shortlog.c | 10 ++++---- builtin/submodule--helper.c | 24 +++++++++---------- parse-options.h | 6 ++--- 8 files changed, 64 insertions(+), 64 deletions(-)
base-commit: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-822%2Fadlternative%2Fdev-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-822/adlternative/dev-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/822
Range-diff vs v2:
2: c5f01b0eab1 ! 1: 9d508df032b parse-options: format argh like error messages
@@ Commit message
Noticed-by ZheNing Hu <[email protected]>
Signed-off-by Junio C Hamano <[email protected]>
+ Signed-off-by: ZheNing Hu <[email protected]>
## parse-options.h ##
@@ parse-options.h: typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
1: 52f7c8457dd ! 2: d3eb6dcff14 builtin/*: update usage format
@@ Metadata
## Commit message ##
builtin/*: update usage format
- According to the "Error Messages" section of
- Documentation/CodingGuidelines, we should not end in a full
- stop or start with a capital letter. Fix old error and usage
+ According to the guidelines in parse-options.h,
+ we should not end in a full stop or start with
+ a capital letter. Fix old error and usage
messages to match this expectation.
Signed-off-by ZheNing Hu <[email protected]>
Signature · 1 line
gitgitgadget
PATCH v3 1/2 parse-options: format argh like error messages
From: Junio C Hamano <[email protected]>
"Keep it homogeneous across the repository" is in general a guideline that can be used to converge to a good practice, but we can be a bit more prescriptive in this case. Just like the messages we give die(_("...")) are formatted without the final full stop and without the initial capitalization, most of the argument help text are already formatted that way, and we want to encourage that as the house style.
Noticed-by ZheNing Hu <[email protected]>
Signed-off-by Junio C Hamano <[email protected]>
Signed-off-by ZheNing Hu <[email protected]>
--- parse-options.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
parse-options.h +3 -3
@@ -82,9 +82,9 @@ typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,* stores pointers to the values to be filled. * * `argh`:: -* token to explain the kind of argument this option wants. Keep it -* homogeneous across the repository. Should be wrapped by N_() for -* translation. +* token to explain the kind of argument this option wants. Does not +* begin in capital letter, and does not end with a full stop. +* Should be wrapped by N_() for translation. * * `help`:: * the short help associated to what the option does.
Signature · 1 line
gitgitgadget
PATCH v3 2/2 builtin/*: update usage format
In reply to 阿德烈 via GitGitGadgetFrom: ZheNing Hu <[email protected]>
According to the guidelines in parse-options.h, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation.
Signed-off-by ZheNing Hu <[email protected]>
--- builtin/am.c | 4 ++-- builtin/blame.c | 48 ++++++++++++++++++------------------- builtin/commit-graph.c | 6 ++--- builtin/fast-export.c | 22 ++++++++--------- builtin/log.c | 8 +++---- builtin/shortlog.c | 10 ++++---- builtin/submodule--helper.c | 24 +++++++++---------- 7 files changed, 61 insertions(+), 61 deletions(-)
builtin/am.c +2 -2
@@ -2284,10 +2284,10 @@ int cmd_am(int argc, const char **argv, const char *prefix) N_("skip the current patch"), RESUME_SKIP),OPT_CMDMODE (0 ,"abort" , &resume.mode, -N_ ("restore the original branch and abort the patching operation." ), +N_ ("restore the original branch and abort the patching operation" ),RESUME_ABORT ),OPT_CMDMODE (0 ,"quit" , &resume.mode, -N_ ("abort the patching operation but keep HEAD where it is." ), +N_ ("abort the patching operation but keep HEAD where it is" ),RESUME_QUIT ), { OPTION_CALLBACK, 0, "show-current-patch", &resume.mode, "(diff|raw)",
builtin/blame.c +24 -24
57 lines not on this page · raw message
builtin/commit-graph.c +3 -3
@@ -78,7 +78,7 @@ static int graph_verify(int argc, const char **argv)static struct option builtin_commit_graph_verify_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_BOOL (0 ,"shallow" , &opts.shallow,N_ ("if the commit-graph is split, only verify the tip file" )),OPT_BOOL (0 ,"progress" , &opts.progress,N_ ("force progress reporting" )),
@@ -208,7 +208,7 @@ static int graph_write(int argc, const char **argv)static struct option builtin_commit_graph_write_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_BOOL (0 ,"reachable" , &opts.reachable,N_ ("start walk at all refs" )), OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -314,7 +314,7 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)static struct option builtin_commit_graph_options[] = {OPT_STRING (0 ,"object-dir" , &opts.obj_dir,N_ ("dir" ), -N_ ("The object directory to store the graph" )), +N_ ("the object directory to store the graph" )),OPT_END (), };
builtin/fast-export.c +11 -11
@@ -1205,32 +1205,32 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) N_("select handling of commit messages in an alternate encoding"), parse_opt_reencode_mode),OPT_STRING (0 ,"export-marks" , &export_filename,N_ ("file" ), -N_ ("Dump marks to this file" )), +N_ ("dump marks to this file" )),OPT_STRING (0 ,"import-marks" , &import_filename,N_ ("file" ), -N_ ("Import marks from this file" )), +N_ ("import marks from this file" )),OPT_STRING (0 ,"import-marks-if-exists" , &import_filename_if_exists,N_ ("file" ), -N_ ("Import marks from this file if it exists" )), +N_ ("import marks from this file if it exists" )),OPT_BOOL (0 ,"fake-missing-tagger" , &fake_missing_tagger, -N_ ("Fake a tagger when tags lack one" )), +N_ ("fake a tagger when tags lack one" )),OPT_BOOL (0 ,"full-tree" , &full_tree, -N_ ("Output full tree for each commit" )), +N_ ("output full tree for each commit" )),OPT_BOOL (0 ,"use-done-feature" , &use_done_feature, -N_ ("Use the done feature to terminate the stream" )), -OPT_BOOL (0 ,"no-data" , &no_data,N_ ("Skip output of blob data" )), +N_ ("use the done feature to terminate the stream" )), +OPT_BOOL (0 ,"no-data" , &no_data,N_ ("skip output of blob data" )),OPT_STRING_LIST (0 ,"refspec" , &refspecs_list,N_ ("refspec" ), -N_ ("Apply refspec to exported refs" )), +N_ ("apply refspec to exported refs" )),OPT_BOOL (0 ,"anonymize" , &anonymize,N_ ("anonymize output" )),OPT_CALLBACK_F (0 ,"anonymize-map" , &anonymized_seeds,N_ ("from:to" ),N_ ("convert <from> to <to> in anonymized output" ),PARSE_OPT_NONEG , parse_opt_anonymize_map),OPT_BOOL (0 ,"reference-excluded-parents" , - &reference_excluded_commits,N_ ("Reference parents which are not in fast-export stream by object id" )), + &reference_excluded_commits,N_ ("reference parents which are not in fast-export stream by object id" )),OPT_BOOL (0 ,"show-original-ids" , &show_original_ids, -N_ ("Show original object ids of blobs/commits" )), +N_ ("show original object ids of blobs/commits" )),OPT_BOOL (0 ,"mark-tags" , &mark_tags, -N_ ("Label tags with mark ids" )), +N_ ("label tags with mark ids" )),OPT_END () };
builtin/log.c +4 -4
@@ -177,7 +177,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,const struct option builtin_log_options[] = {OPT__QUIET (&quiet,N_ ("suppress diff output" )),OPT_BOOL (0 ,"source" , &source,N_ ("show source" )), -OPT_BOOL (0 ,"use-mailmap" , &mailmap,N_ ("Use mail map file" )), +OPT_BOOL (0 ,"use-mailmap" , &mailmap,N_ ("use mail map file" )),OPT_ALIAS (0 ,"mailmap" ,"use-mailmap" ),OPT_STRING_LIST (0 ,"decorate-refs" , &decorate_refs_include,N_ ("pattern" ),N_ ("only decorate refs that match <pattern>" )),
@@ -186,7 +186,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,OPT_CALLBACK_F (0 ,"decorate" ,NULL ,NULL ,N_ ("decorate options" ),PARSE_OPT_OPTARG , decorate_callback),OPT_CALLBACK ('L' ,NULL , &line_cb,"range:file" , -N_ ("Trace the evolution of line range <start>,<end> or function :<funcname> in <file>" ), +N_ ("trace the evolution of line range <start>,<end> or function :<funcname> in <file>" ), log_line_range_callback), OPT_END() };
@@ -1757,13 +1757,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)OPT_INTEGER (0 ,"filename-max-length" , &fmt_patch_name_max,N_ ("max length of output filename" )),OPT_CALLBACK_F (0 ,"rfc" , &rev,NULL , -N_ ("Use [RFC PATCH] instead of [PATCH]" ), +N_ ("use [RFC PATCH] instead of [PATCH]" ),PARSE_OPT_NOARG |PARSE_OPT_NONEG , rfc_callback),OPT_STRING (0 ,"cover-from-description" , &cover_from_description_arg,N_ ("cover-from-description-mode" ),N_ ("generate parts of a cover letter based on a branch's description" )),OPT_CALLBACK_F (0 ,"subject-prefix" , &rev,N_ ("prefix" ), -N_ ("Use [<prefix>] instead of [PATCH]" ), +N_ ("use [<prefix>] instead of [PATCH]" ),PARSE_OPT_NONEG , subject_prefix_callback), OPT_CALLBACK_F('o', "output-directory", &output_directory, N_("dir"), N_("store resulting files in <dir>"),
builtin/shortlog.c +5 -5
@@ -360,19 +360,19 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)const struct option options[] = {OPT_BIT ('c' ,"committer" , &log.groups, -N_ ("Group by committer rather than author" ), +N_ ("group by committer rather than author" ),SHORTLOG_GROUP_COMMITTER ),OPT_BOOL ('n' ,"numbered" , &log.sort_by_number,N_ ("sort output according to the number of commits per author" )),OPT_BOOL ('s' ,"summary" , &log.summary, -N_ ("Suppress commit descriptions, only provides commit count" )), +N_ ("suppress commit descriptions, only provides commit count" )),OPT_BOOL ('e' ,"email" , &log.email, -N_ ("Show the email address of each author" )), +N_ ("show the email address of each author" )),OPT_CALLBACK_F ('w' ,NULL , &log,N_ ("<w>[,<i1>[,<i2>]]" ), -N_ ("Linewrap output" ),PARSE_OPT_OPTARG , +N_ ("linewrap output" ),PARSE_OPT_OPTARG , &parse_wrap_args),OPT_CALLBACK (0 ,"group" , &log,N_ ("field" ), -N_ ("Group by field" ), parse_group_option), +N_ ("group by field" ), parse_group_option),OPT_END (), };
builtin/submodule--helper.c +12 -12
@@ -562,9 +562,9 @@ static int module_foreach(int argc, const char **argv, const char *prefix)struct module_list list =MODULE_LIST_INIT ;struct option module_foreach_options[] = { -OPT__QUIET (&info.quiet,N_ ("Suppress output of entering each submodule command" )), +OPT__QUIET (&info.quiet,N_ ("suppress output of entering each submodule command" )),OPT_BOOL (0 ,"recursive" , &info.recursive, -N_ ("Recurse into nested submodules" )), +N_ ("recurse into nested submodules" )),OPT_END () };
@@ -706,7 +706,7 @@ static int module_init(int argc, const char **argv, const char *prefix)int quiet =0 ;struct option module_init_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output for initializing a submodule" )), +OPT__QUIET (&quiet,N_ ("suppress output for initializing a submodule" )),OPT_END () };
@@ -883,8 +883,8 @@ static int module_status(int argc, const char **argv, const char *prefix)int quiet =0 ;struct option module_status_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress submodule status output" )), -OPT_BIT (0 ,"cached" , &info.flags,N_ ("Use commit stored in the index instead of the one stored in the submodule HEAD" ),OPT_CACHED ), +OPT__QUIET (&quiet,N_ ("suppress submodule status output" )), +OPT_BIT (0 ,"cached" , &info.flags,N_ ("use commit stored in the index instead of the one stored in the submodule HEAD" ),OPT_CACHED ),OPT_BIT (0 ,"recursive" , &info.flags,N_ ("recurse into nested submodules" ),OPT_RECURSIVE ),OPT_END () };
@@ -1482,9 +1482,9 @@ static int module_sync(int argc, const char **argv, const char *prefix)int recursive =0 ;struct option module_sync_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output of synchronizing submodule url" )), +OPT__QUIET (&quiet,N_ ("suppress output of synchronizing submodule url" )),OPT_BOOL (0 ,"recursive" , &recursive, -N_ ("Recurse into nested submodules" )), +N_ ("recurse into nested submodules" )),OPT_END () };
@@ -1620,9 +1620,9 @@ static int module_deinit(int argc, const char **argv, const char *prefix)int all =0 ;struct option module_deinit_options[] = { -OPT__QUIET (&quiet,N_ ("Suppress submodule status output" )), -OPT__FORCE (&force,N_ ("Remove submodule working trees even if they contain local changes" ),0 ), -OPT_BOOL (0 ,"all" , &all,N_ ("Unregister all submodules" )), +OPT__QUIET (&quiet,N_ ("suppress submodule status output" )), +OPT__FORCE (&force,N_ ("remove submodule working trees even if they contain local changes" ),0 ), +OPT_BOOL (0 ,"all" , &all,N_ ("unregister all submodules" )),OPT_END () };
@@ -2337,7 +2337,7 @@ static int update_clone(int argc, const char **argv, const char *prefix)OPT_BOOL (0 ,"dissociate" , &suc.dissociate,N_ ("use --reference only while cloning" )),OPT_STRING (0 ,"depth" , &suc.depth,"<depth>" , -N_ ("Create a shallow clone truncated to the " +N_ ("create a shallow clone truncated to the " "specified number of revisions" )),OPT_INTEGER ('j' ,"jobs" , &suc.max_jobs, N_("parallel jobs")),
@@ -2678,7 +2678,7 @@ static int module_set_url(int argc, const char **argv, const char *prefix)char *config_name;struct option options[] = { -OPT__QUIET (&quiet,N_ ("Suppress output for setting url of a submodule" )), +OPT__QUIET (&quiet,N_ ("suppress output for setting url of a submodule" )),OPT_END () };const char *const usage[] = {
Signature · 1 line
gitgitgadget
Quoted 9 lines
builtin/am.c | 4 ++-- builtin/blame.c | 48 ++++++++++++++++++------------------- builtin/commit-graph.c | 6 ++--- builtin/fast-export.c | 22 ++++++++--------- builtin/log.c | 8 +++---- builtin/shortlog.c | 10 ++++---- builtin/submodule--helper.c | 24 +++++++++---------- parse-options.h | 6 ++--- 8 files changed, 64 insertions(+), 64 deletions(-)
Looks good to me. Thanks.