Re: [PATCH v2 3/4] builtin/commit: suggest update-ref for pseudoref removal
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 19, 2020, 21:24 UTC
- Message-ID
- <xmqqwo1us506.fsf@gitster.c.googlers.com>
- In-Reply-To
- <2681638651debf267bbe7e45e41decca5852808b.1597850128.git.gitgitgadget@gmail.com>
"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 10 quoted lines
> From: Han-Wen Nienhuys <hanwen@google.com> > > When pseudorefs move to a different ref storage mechanism, pseudorefs no longer > can be removed with 'rm'. Instead, suggest a "update-ref -d" command, which will > work regardless of ref storage backend. > > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > --- > builtin/commit.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-)
The spirit is good, but the execution of this patch hurts i18n by consolidating messages that have been deliberately split and duplicated to avoid sentence lego. Limiting the scope of the change to doing
-please remove the file
- %s
+please remove %s with
+ git update-ref -d '%s'twice may be (unfortunately) more preferrable.
As we'd be repeating the same pseudoref variable twice, introduction of an extra variable pseudoref may be a good idea.
Or would it work better to use %1$s twice, e.g.
status_printf_ln(... _(... "... please remove %1$s with\n" " git update-ref -d '%1$s'\n" "and try again.\n"), pseudoref);
I dunno.