git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/3] branch: error description when deleting a not fully merged branch
Date: Thu, 11 Jan 2024 13:20:55 +0100	[thread overview]
Message-ID: <4aedc15c-4b3f-4f5e-abea-581b501600f8@gmail.com> (raw)
In-Reply-To: <04c3556f-0242-4ac3-b94a-be824cd2004a@gmail.com>

The error message we show when the user tries to delete a not fully
merged branch describes the error and gives a hint to the user:

	error: the branch 'foo' is not fully merged.
	If you are sure you want to delete it, run 'git branch -D foo'.

Let's move the hint part so that it is displayed using the advice
machinery:

	error: the branch 'foo' is not fully merged
	hint: If you are sure you want to delete it, run 'git branch -D foo'
	hint: Disable this message with "git config advice.forceDeleteBranch false"

Rubén Justo (3):
  advice: sort the advice related lists
  advice: fix an unexpected leading space
  branch: make the advice to force-deleting a conditional one

 Documentation/config/advice.txt | 157 ++++++++++++++++----------------
 advice.c                        |  14 ++-
 advice.h                        |  15 +--
 builtin/branch.c                |   8 +-
 4 files changed, 99 insertions(+), 95 deletions(-)

-- 
2.42.0


  parent reply	other threads:[~2024-01-11 12:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-10 14:55 [PATCH] branch: error description when deleting a not fully merged branch Rubén Justo
2024-01-10 17:48 ` Junio C Hamano
2024-01-10 21:46   ` Junio C Hamano
2024-01-11 13:39   ` Rubén Justo
2024-01-11 12:20 ` Rubén Justo [this message]
2024-01-11 12:40   ` [PATCH v2 1/3] advice: sort the advice related lists Rubén Justo
2024-01-11 12:40   ` [PATCH v2 2/3] advice: fix an unexpected leading space Rubén Justo
2024-01-12  1:21     ` Junio C Hamano
2024-01-12  9:10       ` Rubén Justo
2024-01-12 17:52         ` Junio C Hamano
2024-01-12 21:19           ` Junio C Hamano
2024-01-11 12:40   ` [PATCH v2 3/3] branch: make the advice to force-deleting a conditional one Rubén Justo

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=4aedc15c-4b3f-4f5e-abea-581b501600f8@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).