Re: [PATCH 1/1] [Outreachy] merge-ours: include parse-options
From: Johannes Schindelin <hidden>
Date: 2019-10-29 12:56:23
Hi george, On Mon, 28 Oct 2019, george espinoza via GitGitGadget wrote:
From: george espinoza <redacted> Teach this command which currently handles its own argv to use parse-options instead because parse-options helps make sure we handle user input like -h in a standardized way across the project. Also deleted the NO_PARSEOPT flag from git.c to coincide with the conversion of the structure in this command since merge-ours now uses parse-options and needed to update git.c accordingly.
The commit message and the patch look good to me! Thanks, Johannes
quoted hunk ↗ jump to hunk
Signed-off-by: george espinoza <redacted> --- builtin/merge-ours.c | 14 ++++++++++---- git.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 4594507420..fb3674a384 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c@@ -11,14 +11,20 @@ #include "git-compat-util.h" #include "builtin.h" #include "diff.h" +#include "parse-options.h" -static const char builtin_merge_ours_usage[] = - "git merge-ours <base>... -- HEAD <remote>..."; +static const char * const merge_ours_usage[] = { + N_("git merge-ours [<base>...] -- <head> <merge-head>..."), + NULL, +}; int cmd_merge_ours(int argc, const char **argv, const char *prefix) { - if (argc == 2 && !strcmp(argv[1], "-h")) - usage(builtin_merge_ours_usage); + struct option options[] = { + OPT_END() + }; + + argc = parse_options(argc, argv, prefix, options, merge_ours_usage, 0); /* * The contents of the current index becomes the tree wediff --git a/git.c b/git.c index ce6ab0ece2..6aee0e9477 100644 --- a/git.c +++ b/git.c@@ -527,7 +527,7 @@ static struct cmd_struct commands[] = { { "merge-base", cmd_merge_base, RUN_SETUP }, { "merge-file", cmd_merge_file, RUN_SETUP_GENTLY }, { "merge-index", cmd_merge_index, RUN_SETUP | NO_PARSEOPT }, - { "merge-ours", cmd_merge_ours, RUN_SETUP | NO_PARSEOPT }, + { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, { "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, --gitgitgadget