From bec9bb4b3918d2b3c7b91bbb116a667d5d6d298d Mon Sep 17 00:00:00 2001 From: Rubén Justo Date: Thu, 11 Jan 2024 13:40:34 +0100 Subject: branch: make the advice to force-deleting a conditional one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" Signed-off-by: Rubén Justo Signed-off-by: Junio C Hamano --- advice.c | 1 + 1 file changed, 1 insertion(+) (limited to 'advice.c') diff --git a/advice.c b/advice.c index 03322caba0..f6e4c2f302 100644 --- a/advice.c +++ b/advice.c @@ -47,6 +47,7 @@ static struct { [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 }, [ADVICE_DIVERGING] = { "diverging", 1 }, [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 }, + [ADVICE_FORCE_DELETE_BRANCH] = { "forceDeleteBranch", 1 }, [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 }, [ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 }, [ADVICE_IMPLICIT_IDENTITY] = { "implicitIdentity", 1 }, -- cgit v1.3