diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-26 14:13:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-26 14:13:15 -0700 |
| commit | 914a353a128d4d885e138f189e235ad6094d436e (patch) | |
| tree | bd0a5f102b7c99c63ff2f361b10444fc8270174c /builtin/am.c | |
| parent | Merge branch 'rs/ls-tree-no-full-name-fix' (diff) | |
| parent | am: simplify parsing of "--[no-]keep-cr" (diff) | |
| download | git-914a353a128d4d885e138f189e235ad6094d436e.tar.gz git-914a353a128d4d885e138f189e235ad6094d436e.zip | |
Merge branch 'jc/am-parseopt-fix'
Code simplification.
* jc/am-parseopt-fix:
am: simplify parsing of "--[no-]keep-cr"
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin/am.c b/builtin/am.c index 146aeff54f..8bde034fae 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2347,12 +2347,9 @@ int cmd_am(int argc, const char **argv, const char *prefix) N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH), OPT_BOOL('m', "message-id", &state.message_id, N_("pass -m flag to git-mailinfo")), - OPT_SET_INT_F(0, "keep-cr", &keep_cr, - N_("pass --keep-cr flag to git-mailsplit for mbox format"), - 1, PARSE_OPT_NONEG), - OPT_SET_INT_F(0, "no-keep-cr", &keep_cr, - N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"), - 0, PARSE_OPT_NONEG), + OPT_SET_INT(0, "keep-cr", &keep_cr, + N_("pass --keep-cr flag to git-mailsplit for mbox format"), + 1), OPT_BOOL('c', "scissors", &state.scissors, N_("strip everything before a scissors line")), OPT_CALLBACK_F(0, "quoted-cr", &state.quoted_cr, N_("action"), |