[PATCH v2 0/3] branch: error description when deleting a not fully merged branch
- From
Rubén Justo <rjusto@gmail.com>
- Date
- Jan 11, 2024, 12:20 UTC
- Message-ID
- <4aedc15c-4b3f-4f5e-abea-581b501600f8@gmail.com>
- 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