Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOC][FIX] Fix some typos in git-clang-format.sh #5786

Merged
merged 1 commit into from
Jun 12, 2020
Merged

[DOC][FIX] Fix some typos in git-clang-format.sh #5786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/lint/git-clang-format.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ "$#" -lt 1 ]]; then
echo "Run clang-format on files that changed since <commit>"
echo "Examples:"
echo "- Compare last one commit: tests/lint/git-clang-format.sh HEAD~1"
echo "- Compare against upstream/master: tests/lint/git-clang-format.sh upsstream/master"
echo "- Compare against upstream/master: tests/lint/git-clang-format.sh upstream/master"
echo "You can also add -i option to do inplace format"
exit 1
fi
Expand All @@ -48,7 +48,7 @@ CLANG_FORMAT=clang-format-10
if [ -x "$(command -v clang-format-10)" ]; then
CLANG_FORMAT=clang-format-10
elif [ -x "$(command -v clang-format)" ]; then
echo "clang-format might be different from clang-format-10, expect pontential difference."
echo "clang-format might be different from clang-format-10, expect potential difference."
CLANG_FORMAT=clang-format
else
echo "Cannot find clang-format-10"
Expand All @@ -70,6 +70,6 @@ echo "---------clang-format log----------"
cat /tmp/$$.clang-format.txt
echo ""
if grep --quiet -E "diff" < /tmp/$$.clang-format.txt; then
echo "clang-format lint error found. Consider run clang-format-10 on these files to fix them."
echo "clang-format lint error found. Consider running clang-format-10 on these files to fix them."
exit 1
fi