Compare commits
No commits in common. "e8fb49cfb4f1f6d0d39c7d6cf4d369c2e0724cb2" and "9123c23633b32b684f00a3da6713722b0c00a1bf" have entirely different histories.
e8fb49cfb4
...
9123c23633
36
pre-commit
36
pre-commit
@ -7,36 +7,14 @@ if hash black 2>/dev/null; then
|
||||
|
||||
# Find all of the .py files in the current git repo, apply black formatting to them and then
|
||||
# add them again
|
||||
cached_files=$(git diff --cached --name-status | \
|
||||
git diff --cached --name-status | \
|
||||
grep -v '^D' | grep '\.py' | \
|
||||
sed 's/[A-Z][ \t]*//')
|
||||
|
||||
# Only run if we have cached python files
|
||||
if [ "$cached_files" ]; then
|
||||
black --line-length 100 $cached_files \
|
||||
&& git add $cached_files \
|
||||
|| exit 1
|
||||
|
||||
|
||||
fi
|
||||
sed 's/[A-Z][ \t]*//' | \
|
||||
xargs black 2>&1| \
|
||||
grep '^reformatted' | \
|
||||
sed 's/reformatted[ \t]//' | \
|
||||
xargs git add
|
||||
|
||||
else
|
||||
echo "Black isn't installed so not formatting python code"
|
||||
"Black isn't installed so not formatting python code"
|
||||
fi
|
||||
|
||||
# Only run if intellij is set up
|
||||
if hash idea.sh 2>/dev/null; then
|
||||
# Apply intellij
|
||||
cached_files=$(git diff --cached --name-status | \
|
||||
grep -v '^D' | grep '\.java' | \
|
||||
sed 's/[A-Z][ \t]*//')
|
||||
|
||||
|
||||
if [ "$cached_files" ]; then
|
||||
idea.sh format -allowDefaults $cached_files 2>/dev/null \
|
||||
&& git add $cached_files \
|
||||
|| exit 1
|
||||
fi
|
||||
else
|
||||
echo "intellij isn't installed so not formatting java code"
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user