Skip to content

Commit 23c6a80

Browse files
Michael J Grubergitster
Michael J Gruber
authored and
gitster
committed
Make <identifier> lowercase as per CodingGuidelines
*.c part for matches with '"[A-Z]+"'. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1d5006a commit 23c6a80

8 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎builtin/commit.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ static struct option builtin_commit_options[] = {
119119

120120
OPT_GROUP("Commit message options"),
121121
OPT_FILENAME('F', "file", &logfile, "read message from file"),
122-
OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
123-
OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"),
124-
OPT_CALLBACK('m', "message", &message, "MESSAGE", "commit message", opt_parse_m),
125-
OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
126-
OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
127-
OPT_STRING(0, "fixup", &fixup_message, "COMMIT", "use autosquash formatted message to fixup specified commit"),
128-
OPT_STRING(0, "squash", &squash_message, "COMMIT", "use autosquash formatted message to squash specified commit"),
122+
OPT_STRING(0, "author", &force_author, "author", "override author for commit"),
123+
OPT_STRING(0, "date", &force_date, "date", "override date for commit"),
124+
OPT_CALLBACK('m', "message", &message, "message", "commit message", opt_parse_m),
125+
OPT_STRING('c', "reedit-message", &edit_message, "commit", "reuse and edit message from specified commit"),
126+
OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"),
127+
OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"),
128+
OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"),
129129
OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"),
130130
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
131131
OPT_FILENAME('t', "template", &template_file, "use specified template file"),

‎builtin/config.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static struct option builtin_config_options[] = {
5252
OPT_BOOLEAN(0, "global", &use_global_config, "use global config file"),
5353
OPT_BOOLEAN(0, "system", &use_system_config, "use system config file"),
5454
OPT_BOOLEAN(0, "local", &use_local_config, "use repository config file"),
55-
OPT_STRING('f', "file", &given_config_file, "FILE", "use given config file"),
55+
OPT_STRING('f', "file", &given_config_file, "file", "use given config file"),
5656
OPT_GROUP("Action"),
5757
OPT_BIT(0, "get", &actions, "get value: name [value-regex]", ACTION_GET),
5858
OPT_BIT(0, "get-all", &actions, "get all values: key [value-regex]", ACTION_GET_ALL),

‎builtin/fast-export.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
619619
OPT_CALLBACK(0, "tag-of-filtered-object", &tag_of_filtered_mode, "mode",
620620
"select handling of tags that tag filtered objects",
621621
parse_opt_tag_of_filtered_mode),
622-
OPT_STRING(0, "export-marks", &export_filename, "FILE",
622+
OPT_STRING(0, "export-marks", &export_filename, "file",
623623
"Dump marks to this file"),
624-
OPT_STRING(0, "import-marks", &import_filename, "FILE",
624+
OPT_STRING(0, "import-marks", &import_filename, "file",
625625
"Import marks from this file"),
626626
OPT_BOOLEAN(0, "fake-missing-tagger", &fake_missing_tagger,
627627
"Fake a tagger when tags lack one"),

‎builtin/fetch.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static struct option builtin_fetch_options[] = {
4949
"fetch from all remotes"),
5050
OPT_BOOLEAN('a', "append", &append,
5151
"append to .git/FETCH_HEAD instead of overwriting"),
52-
OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
52+
OPT_STRING(0, "upload-pack", &upload_pack, "path",
5353
"path to upload pack on remote end"),
5454
OPT__FORCE(&force, "force overwrite of local branch"),
5555
OPT_BOOLEAN('m', "multiple", &multiple,
@@ -69,9 +69,9 @@ static struct option builtin_fetch_options[] = {
6969
OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
7070
"allow updating of HEAD ref"),
7171
OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
72-
OPT_STRING(0, "depth", &depth, "DEPTH",
72+
OPT_STRING(0, "depth", &depth, "depth",
7373
"deepen history of shallow clone"),
74-
{ OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "DIR",
74+
{ OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "dir",
7575
"prepend this to submodule path output", PARSE_OPT_HIDDEN },
7676
OPT_END()
7777
};

‎builtin/merge.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static struct option builtin_merge_options[] = {
194194
"merge strategy to use", option_parse_strategy),
195195
OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
196196
"option for selected merge strategy", option_parse_x),
197-
OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE",
197+
OPT_CALLBACK('m', "message", &merge_msg, "message",
198198
"merge commit message (for a non-fast-forward merge)",
199199
option_parse_message),
200200
OPT__VERBOSITY(&verbosity),

‎builtin/notes.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -537,16 +537,16 @@ static int add(int argc, const char **argv, const char *prefix)
537537
const unsigned char *note;
538538
struct msg_arg msg = { 0, 0, STRBUF_INIT };
539539
struct option options[] = {
540-
{ OPTION_CALLBACK, 'm', "message", &msg, "MSG",
540+
{ OPTION_CALLBACK, 'm', "message", &msg, "msg",
541541
"note contents as a string", PARSE_OPT_NONEG,
542542
parse_msg_arg},
543-
{ OPTION_CALLBACK, 'F', "file", &msg, "FILE",
543+
{ OPTION_CALLBACK, 'F', "file", &msg, "file",
544544
"note contents in a file", PARSE_OPT_NONEG,
545545
parse_file_arg},
546-
{ OPTION_CALLBACK, 'c', "reedit-message", &msg, "OBJECT",
546+
{ OPTION_CALLBACK, 'c', "reedit-message", &msg, "object",
547547
"reuse and edit specified note object", PARSE_OPT_NONEG,
548548
parse_reedit_arg},
549-
{ OPTION_CALLBACK, 'C', "reuse-message", &msg, "OBJECT",
549+
{ OPTION_CALLBACK, 'C', "reuse-message", &msg, "object",
550550
"reuse specified note object", PARSE_OPT_NONEG,
551551
parse_reuse_arg},
552552
OPT__FORCE(&force, "replace existing notes"),
@@ -682,16 +682,16 @@ static int append_edit(int argc, const char **argv, const char *prefix)
682682
const char * const *usage;
683683
struct msg_arg msg = { 0, 0, STRBUF_INIT };
684684
struct option options[] = {
685-
{ OPTION_CALLBACK, 'm', "message", &msg, "MSG",
685+
{ OPTION_CALLBACK, 'm', "message", &msg, "msg",
686686
"note contents as a string", PARSE_OPT_NONEG,
687687
parse_msg_arg},
688-
{ OPTION_CALLBACK, 'F', "file", &msg, "FILE",
688+
{ OPTION_CALLBACK, 'F', "file", &msg, "file",
689689
"note contents in a file", PARSE_OPT_NONEG,
690690
parse_file_arg},
691-
{ OPTION_CALLBACK, 'c', "reedit-message", &msg, "OBJECT",
691+
{ OPTION_CALLBACK, 'c', "reedit-message", &msg, "object",
692692
"reuse and edit specified note object", PARSE_OPT_NONEG,
693693
parse_reedit_arg},
694-
{ OPTION_CALLBACK, 'C', "reuse-message", &msg, "OBJECT",
694+
{ OPTION_CALLBACK, 'C', "reuse-message", &msg, "object",
695695
"reuse specified note object", PARSE_OPT_NONEG,
696696
parse_reuse_arg},
697697
OPT_END()

‎builtin/read-tree.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
104104
struct unpack_trees_options opts;
105105
int prefix_set = 0;
106106
const struct option read_tree_options[] = {
107-
{ OPTION_CALLBACK, 0, "index-output", NULL, "FILE",
108-
"write resulting index to <FILE>",
107+
{ OPTION_CALLBACK, 0, "index-output", NULL, "file",
108+
"write resulting index to <file>",
109109
PARSE_OPT_NONEG, index_output_cb },
110110
OPT_SET_INT(0, "empty", &read_empty,
111111
"only empty the index", 1),

‎builtin/tag.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
376376
OPT_GROUP("Tag creation options"),
377377
OPT_BOOLEAN('a', NULL, &annotate,
378378
"annotated tag, needs a message"),
379-
OPT_CALLBACK('m', NULL, &msg, "MESSAGE",
379+
OPT_CALLBACK('m', NULL, &msg, "message",
380380
"tag message", parse_msg_arg),
381381
OPT_FILENAME('F', NULL, &msgfile, "read message from file"),
382382
OPT_BOOLEAN('s', NULL, &sign, "annotated and GPG-signed tag"),

0 commit comments

Comments
 (0)