worktree: fix order of arguments in error message
`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> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matheus Tavares committed
Nov 20, 2020 at 12:09 UTC
b86339b12bc7ef179e2ce4096a5d1ede257ca4d2
1 file changed
+2
-2
builtin/worktree.c
+2
-2
@@ -304,9 +304,9 @@ static void check_candidate_path(const char *path,
304
}
305
306
if (locked)
307
- die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), cmd, path);
307
+ die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path, cmd);
308
else
309
- die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), cmd, path);
309
+ die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd);
310
}
311
312
static int add_worktree(const char *path, const char *refname,