am: unify definition of --keep-cr and --no-keep-cr

Commit Message

René Scharfe July 21, 2023, 12:42 p.m. UTC

The options --keep-cr and --no-keep-cr set the variable keep_cr to 1 and
0, respectively.  We don't usually define the negative variant
explicitly.  The extra help text only tells users that the option
overrules the config option am.keepcr, which conforms to convention.

So allow --keep-cr to be negated and drop the now redundant definition
of --no-keep-cr for consistency.

Suggested-by: Junio C Hamano <[e-mail]>
Signed-off-by: René Scharfe <[e-mail]>
---
 builtin/am.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--
2.41.0

Patch

diff --git a/builtin/am.c b/builtin/am.c
index dcb89439b1..a216024e1d 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,
+		OPT_SET_INT(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),
+			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"),