From: Juliana Fajardini <jufajardini@oisf.net>
Date: Tue, 9 Aug 2022 18:20:25 +0000 (-0300)
Subject: scripts/clang: remove mention to rewrite-branch
X-Git-Tag: suricata-7.0.0-rc2~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc71faaa8a31974afdc42720472be55bd39ee51e;p=thirdparty%2Fsuricata.git

scripts/clang: remove mention to rewrite-branch

Although we prefer that formatting changes (e.g. the ones made by
running clang) go in a different commit, our script error message was
still suggesting `rewrite-branch` as an option. Removed that and added
that the changes made by the script should go into a separate commit.
---

diff --git a/scripts/clang-format.sh b/scripts/clang-format.sh
index 86c3a8392c..89b1423101 100755
--- a/scripts/clang-format.sh
+++ b/scripts/clang-format.sh
@@ -431,7 +431,8 @@ function CheckBranch {
             Error "Branch requires formatting"
             Debug "View required changes with clang-format: ${italic}$format_changes${normal}"
             Error "View required changes with: ${italic}$EXEC $command --diff${normal}"
-            Error "Use ${italic}$EXEC rewrite-branch${normal} or ${italic}$EXEC branch${normal} to fix formatting"
+            Error "Use ${italic}./scripts/$EXEC branch${normal} to fix formatting,
+            then add formatting changes to a new commit"
             ExitWith $EXIT_CODE_FORMATTING_REQUIRED
         else
             return $EXIT_CODE_FORMATTING_REQUIRED