| Message ID | 1d740e0d4fc08a9f420373c6cd0a554b3b4b1f40.1605883395.git.matheus.bernardino@usp.br (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b86339b12bc7ef179e2ce4096a5d1ede257ca4d2 |
| Headers | show |
| Series | worktree: fix order of arguments in error message | expand |
On Fri, Nov 20, 2020 at 10:09 AM Matheus Tavares <matheus.bernardino@usp.br> 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@usp.br> > --- > - 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@sunshineco.com>
diff --git a/builtin/worktree.c b/builtin/worktree.c index ce56fdaaa9..197fd24a55 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -304,9 +304,9 @@ static void check_candidate_path(const char *path, } if (locked) - 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); else - die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), cmd, path); + die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd); } static int add_worktree(const char *path, const char *refname,
`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. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> --- builtin/worktree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)