On Fri, Nov 20, 2020 at 10:09 AM Matheus Tavares
<matheus.bernardino@xxxxxx> wrote:
> `git worktree add` (without --force) errors out when given a path
> that is already registered as a worktree and the path is missing on
> disk. But the `cmd` and `path` strings are switched on the error
> message. Let's fix that.
Thanks. This problem was introduced quite recently by d179af679b
(worktree: generalize candidate worktree path validation, 2020-06-10).
> Signed-off-by: Matheus Tavares <matheus.bernardino@xxxxxx>
> ---
> - die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), cmd, path);
> + die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path, cmd);
The fix is obviously correct. For what it's worth, this patch is:
Reviewed-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
