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.
Thanks,
-Stolee
