aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-05 14:54:27 -0700
committerJunio C Hamano <gitster@pobox.com>2020-05-05 14:54:27 -0700
commit66527162008d2792c0000096dd7a41d6d5797df3 (patch)
tree6eb0708de90242185ee953963ff17086e507ce8f /builtin/commit-tree.c
parentMerge branch 'jk/test-fail-prereqs-fix' (diff)
parentUse OPT_CALLBACK and OPT_CALLBACK_F (diff)
downloadgit-66527162008d2792c0000096dd7a41d6d5797df3.tar.gz
git-66527162008d2792c0000096dd7a41d6d5797df3.zip
Merge branch 'dl/opt-callback-cleanup'
Code cleanup. * dl/opt-callback-cleanup: Use OPT_CALLBACK and OPT_CALLBACK_F
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index b866d83951..1031b9a491 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -108,15 +108,15 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
struct object_id commit_oid;
struct option options[] = {
- { OPTION_CALLBACK, 'p', NULL, &parents, N_("parent"),
+ OPT_CALLBACK_F('p', NULL, &parents, N_("parent"),
N_("id of a parent commit object"), PARSE_OPT_NONEG,
- parse_parent_arg_callback },
- { OPTION_CALLBACK, 'm', NULL, &buffer, N_("message"),
+ parse_parent_arg_callback),
+ OPT_CALLBACK_F('m', NULL, &buffer, N_("message"),
N_("commit message"), PARSE_OPT_NONEG,
- parse_message_arg_callback },
- { OPTION_CALLBACK, 'F', NULL, &buffer, N_("file"),
+ parse_message_arg_callback),
+ OPT_CALLBACK_F('F', NULL, &buffer, N_("file"),
N_("read commit log message from file"), PARSE_OPT_NONEG,
- parse_file_arg_callback },
+ parse_file_arg_callback),
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_END()