branch: update error messages
cover branch: update error messages
A message like "branch 'frog' checked out at ..." may be confusing to the user if the branch 'frog' is not the currently checked out branch, which may occur while rebasing, bisecting or other operations.
Let's reword those messages as it has been done in 4970bedef2 (branch:
update the message to refuse touching a branch in-use, 2023-07-21).
Rubén Justo (2):
branch: error message deleting a branch in use
branch: error message checking out a branch in use
branch.c | 2 +- builtin/branch.c | 2 +- t/t2400-worktree-add.sh | 3 ++- t/t3200-branch.sh | 14 +++++++++++++- t/t3400-rebase.sh | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-)
Signature · 1 line
2.42.0.rc0.2.gbb987841e8
PATCH 1/2 branch: error message deleting a branch in use
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).
--- builtin/branch.c | 2 +- t/t3200-branch.sh | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
builtin/branch.c +1 -1
@@ -261,7 +261,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,const char *path;if ((path =branch_checked_out (name))) {error (_ ("Cannot delete branch '%s' " -"checked out at '%s'" ), +"used by worktree at '%s'" ), bname.buf, path); ret =1 ;continue ;
t/t3200-branch.sh +13 -1
@@ -942,7 +942,19 @@ test_expect_success 'test deleting branch without config' ' test_expect_success 'deleting currently checked out branch fails' ' git worktree add -b my7 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 && git worktree prune '
Signature · 1 line
2.42.0.rc0.2.gbb987841e8
PATCH 2/2 branch: error message checking out a branch in use
In reply to Rubén JustoLet'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).
--- branch.c | 2 +- t/t2400-worktree-add.sh | 3 ++- t/t3400-rebase.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
branch.c +1 -1
@@ -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' already used by worktree at '%s'" ), branch, worktrees[i]->path); } }
t/t2400-worktree-add.sh +2 -1
@@ -121,7 +121,8 @@ test_expect_success '"add" worktree creating new branch' ' test_expect_success 'die the same branch is already checked out' ' ( cd here && - test_must_fail git checkout newmain + test_must_fail git checkout newmain 2> actual && + grep "already used by worktree at" actual ) '
t/t3400-rebase.sh +1 -1
@@ -421,7 +421,7 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' ' git checkout main && git worktree add wt && 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' '
Signature · 1 line
2.42.0.rc0.2.gbb987841e8
Re: [PATCH 2/2] branch: error message checking out a branch in use
Quoted 17 lines · Rubén Justo
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 <[email protected]>--- branch.c | 2 +- t/t2400-worktree-add.sh | 3 ++- t/t3400-rebase.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)branch.c +0
-0
branch.c void die_if_checked_out(const char *branch, int ignore_current_worktree) · line 841
Quoted 5 lines
branch.c +1
-1@@ -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' already used by worktree at '%s'"),
I wonder if "'%s' is already used by ..." (with the additional "is" between the branch name and "already") would be clearer / more natural.
Thanks,
Taylor
Re: [PATCH 2/2] branch: error message checking out a branch in use
Quoted 19 lines · Taylor Blau
Quoted 18 lines · Rubén Justo
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 <[email protected]>--- branch.c | 2 +- t/t2400-worktree-add.sh | 3 ++- t/t3400-rebase.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)branch.c +0
-0@@ -838,7 +838,7 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree)
Quoted 7 lines
branch.c void die_if_checked_out(const char *branch, int ignore_current_worktree) · line 841
Quoted 4 lines
branch.c +1
-1if (is_shared_symref (worktrees[i],"HEAD" , branch)) {skip_prefix (branch,"refs/heads/" , &branch); - die(_("'%s' is already checked out at '%s'"), + die(_("'%s' already used by worktree at '%s'"),I wonder if "'%s' is already used by ..." (with the additional "is" between the branch name and "already") would be clearer / more natural.
I have no problem with that change. I think I was trying to keep the message sort ... the tests does not need to be adjusted.
Quoted 4 lines
Thanks,
Taylor
Thanks for reading carefully.
Quoted 3 lines · Rubén Justo
A message like "branch 'frog' checked out at ..." may be confusing to the user if the branch 'frog' is not the currently checked out branch, which may occur while rebasing, bisecting or other operations.
Makes sense. Will queue.
Quoted 14 lines
Let's reword those messages as it has been done in
4970bedef2(branch:
update the message to refuse touching a branch in-use, 2023-07-21).Rubén Justo (2):
branch: error message deleting a branch in use
branch: error message checking out a branch in usebranch.c | 2 +- builtin/branch.c | 2 +- t/t2400-worktree-add.sh | 3 ++- t/t3200-branch.sh | 14 +++++++++++++- t/t3400-rebase.sh | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-)