Re: [PATCH v2 3/9] unpack-trees: refuse to remove startup_info->original_cwd
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Nov 29, 2021, 14:10 UTC
- Message-ID
- <ac7e7241-d852-f0e7-d9c1-053adb242fee@gmail.com>
- In-Reply-To
- <e74975e83cc7a11b8f0378d59a8c2c4a97d3aa50.1637829556.git.gitgitgadget@gmail.com>
On 11/25/2021 3:39 AM, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
Show 9 quoted lines
> @@ -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