diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-24 09:32:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-24 09:32:33 -0700 |
| commit | f5f23a430f25fa956a87a9426791f4ee9055a5bf (patch) | |
| tree | 6af371655983d30cab7e91b33dac5b4c9f754e5e /builtin/branch.c | |
| parent | Git 2.42 (diff) | |
| parent | branch: error message checking out a branch in use (diff) | |
| download | git-f5f23a430f25fa956a87a9426791f4ee9055a5bf.tar.gz git-f5f23a430f25fa956a87a9426791f4ee9055a5bf.zip | |
Merge branch 'rj/branch-in-use-error-message'
A message written in olden time prevented a branch from getting
checked out saying it is already checked out elsewhere, but these
days, we treat a branch that is being bisected or rebased just like
a branch that is checked out and protect it. Rephrase the message
to say that the branch is in use.
* rj/branch-in-use-error-message:
branch: error message checking out a branch in use
branch: error message deleting a branch in use
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 08da650516..2ec190b14a 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -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; |