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.
pull/8815/head
Juliana Fajardini 3 years ago committed by Victor Julien
parent 6ec3bc189a
commit dc71faaa8a

@ -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

Loading…
Cancel
Save