mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch: error message checking out a branch in use

Browse Source 
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>
This commit is contained in:
Rubén Justo
2023-08-07 22:42:40 +02:00
committed by Junio C Hamano
parent 92edf61870
commit 2a499264d3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -838,7 +838,7 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree)
if (is_shared_symref(worktrees[i], "HEAD", branch)) { if (is_shared_symref(worktrees[i], "HEAD", branch)) {
skip_prefix(branch, "refs/heads/", &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); branch, worktrees[i]->path);
} }
} }

3
t/t2400-worktree-add.sh
View File

@ -121,7 +121,8 @@ test_expect_success '"add" worktree creating new branch' '
test_expect_success 'die the same branch is already checked out' ' test_expect_success 'die the same branch is already checked out' '
( (
cd here && cd here &&
test_must_fail git checkout newmain test_must_fail git checkout newmain 2>actual &&
grep "already used by worktree at" actual
) )
' '

2
t/t3400-rebase.sh
View File

@ -421,7 +421,7 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' '
git checkout main && git checkout main &&
git worktree add wt && git worktree add wt &&
test_must_fail git -C wt rebase main main 2>err && test_must_fail git -C wt rebase main main 2>err &&
test_i18ngrep "already checked out" err test_i18ngrep "already used by worktree at" err
' '
test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' ' test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' '