Hi Phillip, Le 2024-02-28 à 09:40, phillip.wood123@xxxxxxxxx a écrit : > Hi Philippe > > On 28/02/2024 13:54, Philippe Blain wrote: >> Range-diff versus v5: >> >> 1: c9536431d1 ! 1: 363657561c revision: ensure MERGE_HEAD is a ref in prepare_show_merge >> @@ Commit message >> (2) obtain the oid without any prefixing by refs.c:repo_dwim_ref() >> (3) error out when MERGE_HEAD is a symref. >> + Note that we avoid marking the new error message for translation as it >> + will be done in the next commit when the message is generalized to other >> + special refs. > > Looking at the change below, the new message is in fact marked for translation. I don't think this matters (other than the commit message being confusing) as the translators will only see the final version of the massage. Oops, you are right, I wanted to do what I wrote but ended up marking it also in 1/2. Junio already merged it to next, so I guess it's gonna stay that way. Thanks for your review, Philippe.
