From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/2] branch: update error messages
Date: Mon, 7 Aug 2023 22:38:38 +0200 [thread overview]
Message-ID: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com> (raw)
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(-)
--
2.42.0.rc0.2.gbb987841e8
next reply other threads:[~2023-08-07 20:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 20:38 Rubén Justo [this message]
2023-08-07 20:42 ` [PATCH 1/2] branch: error message deleting a branch in use Rubén Justo
2023-08-07 20:42 ` [PATCH 2/2] branch: error message checking out " Rubén Justo
2023-08-07 21:34 ` Taylor Blau
2023-08-07 22:49 ` Rubén Justo
2023-08-07 21:18 ` [PATCH 0/2] branch: update error messages Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).