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

branch: error message deleting a branch in use

Browse Source 
Let's update the error message we show when the user tries to delete 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:36 +02:00
committed by Junio C Hamano
parent 4970bedef2
commit 92edf61870
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/branch.c
View File

@ -262,7 +262,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
const char *path; const char *path;
if ((path = branch_checked_out(name))) { if ((path = branch_checked_out(name))) {
error(_("Cannot delete branch '%s' " error(_("Cannot delete branch '%s' "
"checked out at '%s'"), "used by worktree at '%s'"),
bname.buf, path); bname.buf, path);
ret = 1; ret = 1;
continue; continue;

14
t/t3200-branch.sh
View File

@ -942,7 +942,19 @@ test_expect_success 'test deleting branch without config' '
test_expect_success 'deleting currently checked out branch fails' ' test_expect_success 'deleting currently checked out branch fails' '
git worktree add -b my7 my7 && git worktree add -b my7 my7 &&
test_must_fail git -C my7 branch -d my7 && test_must_fail git -C my7 branch -d my7 &&
test_must_fail git branch -d my7 && test_must_fail git branch -d my7 2>actual &&
grep "^error: Cannot delete branch .my7. used by worktree at " actual &&
rm -r my7 &&
git worktree prune
'
test_expect_success 'deleting in-use branch fails' '
git worktree add my7 &&
test_commit -C my7 bt7 &&
git -C my7 bisect start HEAD HEAD~2 &&
test_must_fail git -C my7 branch -d my7 &&
test_must_fail git branch -d my7 2>actual &&
grep "^error: Cannot delete branch .my7. used by worktree at " actual &&
rm -r my7 && rm -r my7 &&
git worktree prune git worktree prune
' '