From 0fcc2f933e588f5a9fa19f3decf91874d935ecfa Mon Sep 17 00:00:00 2001 From: Ilmari Lauhakangas Date: Fri, 10 Feb 2023 08:12:16 +0000 Subject: [PATCH] Revert "check-last-commit: more detailed advice on using clang-format" This reverts commit f59d449ecfc078765dfaa2e150a21a7e4b330932. Reason for revert: confusing Change-Id: If5924ff3952f344f7a418e80d4ceb774dea94430 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146707 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas --- solenv/clang-format/check-last-commit | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/solenv/clang-format/check-last-commit b/solenv/clang-format/check-last-commit index bd26258c5ad4..0de5ac4b0783 100755 --- a/solenv/clang-format/check-last-commit +++ b/solenv/clang-format/check-last-commit @@ -65,11 +65,7 @@ sub check_style() { print("\nERROR: The above differences were found between the code to commit \n"); print("and the clang-format rules. Tips:\n"); - print("\n- On your local machine you may check how clang-format would modify the problematic file by saying\n"); - print(" diff --unified <(/opt/lo/bin/clang-format )\n"); - print("- NOTE: you should only correct the lines that you changed. Do not add unrelated formatting to your patch.\n"); - print("- If the suggested corrections only apply to the lines you changed, you may run\n"); - print(" '/opt/lo/bin/clang-format -i ' to fix up style automatically.\n"); + print("\n- You may run '/opt/lo/bin/clang-format -i ' to fix up style automatically.\n"); print("- See solenv/clang-format/README on where to get the required version of clang-format binaries.\n"); print("- If you renamed an excluded file, update solenv/clang-format/excludelist accordingly to keep it excluded.\n"); print("\nsolenv/clang-format/check-last-commit: KO\n");