From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Philip Oakley via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Philip Oakley <philipoakley@iee.email>
Subject: Re: [PATCH 1/3] rebase.c: state preserve-merges has been removed
Date: Fri, 27 May 2022 14:34:20 +0200 [thread overview]
Message-ID: <220527.86o7zj2ldi.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <19baf95d-67d4-d7ed-72a6-96d098171d3a@web.de>
On Thu, May 26 2022, René Scharfe wrote:
> Am 26.05.22 um 11:40 schrieb Ævar Arnfjörð Bjarmason:
>>
>> On Thu, May 26 2022, Philip Oakley via GitGitGadget wrote:
>>
>>> From: Philip Oakley <philipoakley@iee.email>
>>>
>>> Since feebd2d256 (rebase: hide --preserve-merges option, 2019-10-18)
>>> this option is now removed as stated in the subsequent release notes.
>>>
>>> Fix the option tip.
>>>
>>> Signed-off-by: Philip Oakley <philipoakley@iee.email>
>>> ---
>>> builtin/rebase.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/builtin/rebase.c b/builtin/rebase.c
>>> index 7ab50cda2ad..6ce7e98a6f1 100644
>>> --- a/builtin/rebase.c
>>> +++ b/builtin/rebase.c
>>> @@ -1110,7 +1110,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>>> PARSE_OPT_NOARG | PARSE_OPT_NONEG,
>>> parse_opt_interactive),
>>> OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
>>> - N_("(DEPRECATED) try to recreate merges instead of "
>>> + N_("(REMOVED) try to recreate merges instead of "
>>> "ignoring them"),
>>> 1, PARSE_OPT_HIDDEN),
>>> OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
>>
>> I have some local patches for this more generally, but for
>> PARSE_OPT_HIDDEN options we never do anything with the "argh" field,
>> i.e. it's only used for showing the "git <cmd> -h" output, and if it's
>> hidden it won't be there.
>
> Hidden options are shown if you use --help-all instead of -h.
>
> OPT_SET_INT_F always sets the struct option member "argh" to NULL. The
> string changed above is the "help" member, not "argh".
>
>> So there's no point in changing this string, nor to have translators
>> focus on it, it'll never be used.
>>
>> This series shouldn't fix the general issue (which parse-options.c
>> should really be BUG()-ing about, after fixing the existing
>> occurances. But For this one we could just set this to have a string of
>> "" or something, only the string you're changing in 3/3 will be seen by
>> anyone.
>
> What is the general issue?
You're right. I'd missed that case with --help-all, and remembered
briefly testing where we used the string before in some WIP code.
Looking at it again I think I tried NULL-ing a few and running the tests
with SANITIZE=address or something, which in this case it looks like
we'd 100% pass with. I.e. we have zero test coverage for that subsequent
NULL dereference.
Sorry about the noise. I'll add some tests for this case in some
parse-options.c sanity checking tests/patches I'm planning to submit at
some point.
next prev parent reply other threads:[~2022-05-27 12:48 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 9:21 [PATCH 0/3] Die preserve ggg Philip Oakley via GitGitGadget
2022-05-26 9:21 ` [PATCH 1/3] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-05-26 9:40 ` Ævar Arnfjörð Bjarmason
2022-05-26 11:40 ` Philip Oakley
2022-05-26 13:02 ` René Scharfe
2022-05-26 20:33 ` Junio C Hamano
2022-05-26 21:27 ` René Scharfe
2022-05-26 23:23 ` Junio C Hamano
2022-05-27 12:35 ` Philip Oakley
2022-05-27 12:17 ` Philip Oakley
2022-05-27 15:45 ` Junio C Hamano
2022-05-27 12:12 ` Philip Oakley
2022-05-27 12:34 ` Ævar Arnfjörð Bjarmason [this message]
2022-05-26 9:21 ` [PATCH 2/3] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-05-26 9:43 ` Ævar Arnfjörð Bjarmason
2022-05-26 11:44 ` Philip Oakley
2022-05-26 20:42 ` Junio C Hamano
2022-05-27 12:58 ` Philip Oakley
2022-05-27 15:54 ` Junio C Hamano
2022-05-26 9:21 ` [PATCH 3/3] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-05-26 9:50 ` Ævar Arnfjörð Bjarmason
2022-05-26 12:01 ` Philip Oakley
2022-05-26 20:55 ` Junio C Hamano
2022-05-27 12:08 ` Philip Oakley
2022-05-26 9:54 ` [PATCH 0/3] Die preserve ggg Ævar Arnfjörð Bjarmason
2022-05-26 12:57 ` Philip Oakley
2022-06-04 11:17 ` [PATCH v2 0/4] " Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 1/4] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 2/4] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-06-06 17:57 ` Junio C Hamano
2022-06-11 14:03 ` Philip Oakley
2022-06-11 15:38 ` Philip Oakley
2022-06-11 19:22 ` Junio C Hamano
2022-06-04 11:17 ` [PATCH v2 4/4] rebase: translate a die(preserve-merges) message Philip Oakley via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220527.86o7zj2ldi.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=l.s.r@web.de \
--cc=philipoakley@iee.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).