Skip to content
This repository has been archived by the owner on Dec 26, 2022. It is now read-only.

Commit

Permalink
fix: wrong merge conflict
Browse files Browse the repository at this point in the history
Fix wrong merge conflict in hash 782a6e7.
  • Loading branch information
splasky committed Jul 17, 2020
1 parent c548a46 commit cd1a6c3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions hooks/formatter
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash

for file in $(find $(git rev-parse --show-toplevel) | egrep "\.(c|cc|cpp|h|hh|hpp|m|mm)\$" | egrep -v "third_party|output_base"); do
for file in $(find $(git rev-parse --show-toplevel) | egrep "\.(c|cc|cpp|h|hh|hpp|m|mm)\$" | egrep -v -f hooks/format-exclude-list); do
clang-format -style=file -fallback-style=none -i $file
done

for file in $(find $(git rev-parse --show-toplevel) | egrep "\BUILD\$" | egrep -v "third_party|output_base"); do
for file in $(find $(git rev-parse --show-toplevel) | egrep "\BUILD\$" | egrep -v -f hooks/format-exclude-list); do
buildifier $file
done
buildifier WORKSPACE

for file in $(find $(git rev-parse --show-toplevel) | egrep "\.sh\$" | egrep -v "third_party|output_base"); do
shfmt -w $file
done
for file in $(find $(git rev-parse --show-toplevel) | egrep "\.sh\$" | egrep -v -f hooks/format-exclude-list); do
shfmt -w $file
done

0 comments on commit cd1a6c3

Please sign in to comment.