From: Philip Oakley Date: Fri, 27 May 2022 12:17:50 GMT Subject: Re: [PATCH 1/3] rebase.c: state preserve-merges has been removed Message-ID: <9455d0af-87f2-f331-a440-3d3feb743610@iee.email> In-Reply-To: On 26/05/2022 21:33, Junio C Hamano wrote: > René Scharfe writes: > >>>> 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), >> 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". > Good points. I do think it is OK to say REMOVED in case --help-all > asks us to show everything, even though I wonder if we can leave it > there until we remove the "support" of noticing the user asking for > a now-removed feature. I'll add "was .." to clarify its historic use. I expect that it'll be there for many years to catch late upgrading users, as well as those that help others stuck in this trap using a modern portable Git (esp. Windows). >>> So there's no point in changing this string, nor to have translators >>> focus on it, it'll never be used. >>> >>> The translation change would need to be a separate patch, no? That would make it easy to drop if not wanted. P.