{"thread":{"id":"63935","subject":"[PATCH] merge: don't document non-existing --compact-summary argument","startedAt":"2025-08-09T10:05:33Z","lastAt":"2025-08-10T00:07:34Z","messageCount":2,"participants":["René Scharfe","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"523867","messageId":"890631d1-4e3e-4ea5-8f58-371fadf2b1b3@web.de","threadId":"63935","inReplyTo":null,"subject":"[PATCH] merge: don't document non-existing --compact-summary argument","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2025-08-09T10:00:16Z","receivedAt":"2025-08-09T10:05:33Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"3a54f5bd5d (merge/pull: add the \"--compact-summary\" option, 2025-06-12)\nadded the option --compact-summary to both merge and pull.  It takes no\nno argument, but for merge it got an argument help string.  Remove it,\nsince it is unnecessary.\n\nSigned-off-by: René Scharfe <l.s.r@web.de>\n---\n builtin/merge.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex dc4cb8fb14..ce880e6ccb 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = {\n \tOPT_BOOL(0, \"stat\", &show_diffstat,\n \t\tN_(\"show a diffstat at the end of the merge\")),\n \tOPT_BOOL(0, \"summary\", &show_diffstat, N_(\"(synonym to --stat)\")),\n-\tOPT_CALLBACK_F(0, \"compact-summary\", &show_diffstat, N_(\"compact-summary\"),\n+\tOPT_CALLBACK_F(0, \"compact-summary\", &show_diffstat, NULL,\n \t\t       N_(\"show a compact-summary at the end of the merge\"),\n \t\t       PARSE_OPT_NOARG,\n \t\t       option_parse_compact_summary),\n-- \n2.50.1\n"},{"id":"523878","messageId":"xmqqa54859a3.fsf@gitster.g","threadId":"63935","inReplyTo":"890631d1-4e3e-4ea5-8f58-371fadf2b1b3@web.de","subject":"Re: [PATCH] merge: don't document non-existing --compact-summary argument","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-08-10T00:07:32Z","receivedAt":"2025-08-10T00:07:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Scharfe <l.s.r@web.de> writes:\n\n> 3a54f5bd5d (merge/pull: add the \"--compact-summary\" option, 2025-06-12)\n> added the option --compact-summary to both merge and pull.  It takes no\n> no argument, but for merge it got an argument help string.  Remove it,\n> since it is unnecessary.\n\nThanks.\n\n>\n> Signed-off-by: René Scharfe <l.s.r@web.de>\n> ---\n>  builtin/merge.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/merge.c b/builtin/merge.c\n> index dc4cb8fb14..ce880e6ccb 100644\n> --- a/builtin/merge.c\n> +++ b/builtin/merge.c\n> @@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = {\n>  \tOPT_BOOL(0, \"stat\", &show_diffstat,\n>  \t\tN_(\"show a diffstat at the end of the merge\")),\n>  \tOPT_BOOL(0, \"summary\", &show_diffstat, N_(\"(synonym to --stat)\")),\n> -\tOPT_CALLBACK_F(0, \"compact-summary\", &show_diffstat, N_(\"compact-summary\"),\n> +\tOPT_CALLBACK_F(0, \"compact-summary\", &show_diffstat, NULL,\n>  \t\t       N_(\"show a compact-summary at the end of the merge\"),\n>  \t\t       PARSE_OPT_NOARG,\n>  \t\t       option_parse_compact_summary),\n"}]}