On Mon, Nov 29, 2021 at 6:10 AM Derrick Stolee <stolee@xxxxxxxxx> wrote:
>
> On 11/25/2021 3:39 AM, Elijah Newren via GitGitGadget wrote:
> > From: Elijah Newren <newren@xxxxxxxxx>
>
> > @@ -36,6 +36,9 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
> > /* ERROR_NOT_UPTODATE_DIR */
> > "Updating '%s' would lose untracked files in it",
> >
> > + /* ERROR_CWD_IN_THE_WAY */
> > + "Refusing to remove '%s' since it is the current working directory.",
> > +
> > /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
> > "Untracked working tree file '%s' would be overwritten by merge.",
>
> Your new message includes a hard stop (".") which is non-standard. I
> see that the message after yours has one, but the preceding one does
> not. Since the file you are in is not consistent, I would choose to
> drop the hard stop here.
Seems pretty reasonable, but 9 out of 10 of the messages in that list
contain the hard stop. True, that's still inconsistent, but adding
the hard stop feels more internally consistent. I think I'd rather
have someone else post a subsequent cleanup to remove the hard stops
and lowercase the first letter and whatever else needs to be changed
with these messages.
