diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:43 -0800 |
| commit | f73ee0c6be1c4ce97c623ac6e7d4d2386817bfe0 (patch) | |
| tree | 5dcb475fefd76bfba135c7e132ecc28413f1b135 /builtin/worktree.c | |
| parent | 1c04cdd424b8310fceb179144dac8e829205d807 (diff) | |
| parent | b86339b12bc7ef179e2ce4096a5d1ede257ca4d2 (diff) | |
| download | git-f73ee0c6be1c4ce97c623ac6e7d4d2386817bfe0.tar.gz | |
Merge branch 'mt/worktree-error-message-fix'
Fix formulation of an error message with two placeholders in "git
worktree add" subcommand.
* mt/worktree-error-message-fix:
worktree: fix order of arguments in error message
Diffstat (limited to 'builtin/worktree.c')
| -rw-r--r-- | builtin/worktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |