summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xclang-format-diff.sh2
-rwxr-xr-xclang-tidy-diff.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang-format-diff.sh b/clang-format-diff.sh
index 50a9800b5..2525259e9 100755
--- a/clang-format-diff.sh
+++ b/clang-format-diff.sh
@@ -19,7 +19,7 @@ MERGE_BASE=$(git merge-base $BRANCH HEAD)
FORMAT_MSG=$(git clang-format $MERGE_BASE -q --diff -- src/)
if [ -n "$FORMAT_MSG" -a "$FORMAT_MSG" != "no modified files to format" ]
then
- echo "Run git clang-format before committing!"
+ echo "Please run git clang-format before committing, or apply this diff:"
echo
# Run git clang-format again, this time without capruting stdout. This way
# clang-format format the message nicely and add color.
diff --git a/clang-tidy-diff.sh b/clang-tidy-diff.sh
index 292ec6df6..6827f125b 100755
--- a/clang-tidy-diff.sh
+++ b/clang-tidy-diff.sh
@@ -20,7 +20,7 @@ CLANG_TIDY_DIFF=$CLANG_DIR/share/clang/clang-tidy-diff.py
TIDY_MSG=$(git diff -U0 $BRANCH... | $CLANG_TIDY_DIFF -quiet -p1 2> /dev/null)
if [ -n "$TIDY_MSG" -a "$TIDY_MSG" != "No relevant changes found." ]
then
- echo "Fix clang-tidy errors before committing!"
+ echo "Please run clang-tidy before committing, or apply this diff:"
echo
# Run clang-tidy once again to show the error
git diff -U0 $BRANCH... | $CLANG_TIDY_DIFF -quiet -p1 2> /dev/null