diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-01 15:06:38 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-01 15:06:38 +0900 |
| commit | e1149fd7d95e3b63f56d4360e135428fc3f7eb82 (patch) | |
| tree | 21a585696e84b23bdc087ae87e85278c1f22b754 /builtin/notes.c | |
| parent | Merge branch 'pa/import-tars-long-names' (diff) | |
| parent | Use OPT_SET_INT_F() for cmdline option specification (diff) | |
| download | tgif-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.tar.xz | |
Merge branch 'nd/use-opt-int-set-f'
Code simplification.
* nd/use-opt-int-set-f:
Use OPT_SET_INT_F() for cmdline option specification
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index da279cdd34..6981e2d906 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -778,13 +778,13 @@ static int merge(int argc, const char **argv, const char *prefix) N_("resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)")), OPT_GROUP(N_("Committing unmerged notes")), - { OPTION_SET_INT, 0, "commit", &do_commit, NULL, - N_("finalize notes merge by committing unmerged notes"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1}, + OPT_SET_INT_F(0, "commit", &do_commit, + N_("finalize notes merge by committing unmerged notes"), + 1, PARSE_OPT_NONEG), OPT_GROUP(N_("Aborting notes merge resolution")), - { OPTION_SET_INT, 0, "abort", &do_abort, NULL, - N_("abort notes merge"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1}, + OPT_SET_INT_F(0, "abort", &do_abort, + N_("abort notes merge"), + 1, PARSE_OPT_NONEG), OPT_END() }; |