Skip to content

branch: error description when deleting a not fully merged branch

Rubén Justo git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 4 repliesIn review
  2. v11 patch 3 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3advice: sort the advice related listsDocumentation/config/advice.txt advice.c advice.h+88 -910 replies
2/3advice: fix an unexpected leading spaceadvice.h+2 -14 replies
3/3branch: make the advice to force-deleting a conditional oneDocumentation/config/advice.txt advice.c advice.h +1 more+10 -30 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/3] branch: error description when deleting a not fully merged branch

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(-)
Signature · 1 line
2.42.0