diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-29 13:46:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 13:46:38 +0100 |
| commit | 2f57a11ed9b383706b72783c0d9b1e869774e08a (patch) | |
| tree | 1b2b19bbc51b9b6ee71b3d7599092bdaa7b6dbee /misc/scripts/file_format.sh | |
| parent | 9467350f37089eb3f4ef7de683daba28b0c69dec (diff) | |
| parent | 8a0a3acceee804b91afe31022cf0310c01162f73 (diff) | |
Merge pull request #55785 from nathanfranke/clang-tidy
Diffstat (limited to 'misc/scripts/file_format.sh')
| -rwxr-xr-x | misc/scripts/file_format.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh index e66bc88bc0..0c7235817d 100755 --- a/misc/scripts/file_format.sh +++ b/misc/scripts/file_format.sh @@ -47,10 +47,10 @@ while IFS= read -rd '' f; do perl -i -ple 's/\s*$//g' "$f" done -git diff --color > patch.patch +diff=$(git diff --color) # If no patch has been generated all is OK, clean up, and exit. -if [ ! -s patch.patch ] ; then +if [ -z "$diff" ] ; then printf "Files in this commit comply with the formatting rules.\n" rm -f patch.patch exit 0 @@ -59,7 +59,6 @@ fi # A patch has been created, notify the user, clean up, and exit. printf "\n*** The following differences were found between the code " printf "and the formatting rules:\n\n" -cat patch.patch +echo "$diff" printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n" -rm -f patch.patch exit 1 |