diff options
| author | Rubén Justo <rjusto@gmail.com> | 2023-08-07 22:42:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-08 18:27:30 -0700 |
| commit | 2a499264d39c663517a8e4fe7f3abb55fc4a829a (patch) | |
| tree | 24b0b66bb3d64bb211dee17a1e80d63ed78c88c9 /branch.c | |
| parent | 92edf618709eaee1c3b42481cb478ed00eae1c2b (diff) | |
| download | git-2a499264d39c663517a8e4fe7f3abb55fc4a829a.tar.gz | |
branch: error message checking out a branch in use
Let's update the error message we show when the user tries to check out
a branch which is being used in another worktree, following the
guideline reasoned in 4970bedef2 (branch: update the message to refuse
touching a branch in-use, 2023-07-21).
Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
| -rw-r--r-- | branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -838,7 +838,7 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree) if (is_shared_symref(worktrees[i], "HEAD", branch)) { skip_prefix(branch, "refs/heads/", &branch); - die(_("'%s' is already checked out at '%s'"), + die(_("'%s' is already used by worktree at '%s'"), branch, worktrees[i]->path); } } |