forked from pub-solar/os
pre-commit hook: only format modified lines
instead of entire files
This commit is contained in:
parent
aa1c31dcc2
commit
8f0790b6fd
|
@ -9,15 +9,25 @@ fi
|
||||||
|
|
||||||
diff="git diff-index --name-only --cached $against --diff-filter d"
|
diff="git diff-index --name-only --cached $against --diff-filter d"
|
||||||
|
|
||||||
all_files=($($diff))
|
mapfile -t all_files < <($diff)
|
||||||
|
|
||||||
# Format staged files.
|
# Stash only unstaged changes, keeping staged changes
|
||||||
|
old_stash=$(git rev-parse --quiet --verify refs/stash)
|
||||||
|
git stash push --quiet --keep-index -m 'Unstaged changes before pre-commit hook'
|
||||||
|
new_stash=$(git rev-parse --quiet --verify refs/stash)
|
||||||
|
|
||||||
|
# Format staged files
|
||||||
if ((${#all_files[@]} != 0)); then
|
if ((${#all_files[@]} != 0)); then
|
||||||
treefmt "${all_files[@]}" &&
|
treefmt "${all_files[@]}" &&
|
||||||
git add "${all_files[@]}"
|
git add "${all_files[@]}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check editorconfig
|
# If unstaged changes were stashed re-apply to working tree
|
||||||
|
if [ "$old_stash" != "$new_stash" ]; then
|
||||||
|
git stash pop --quiet
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check editorconfig
|
||||||
if ((${#all_files[@]} != 0)); then
|
if ((${#all_files[@]} != 0)); then
|
||||||
if ! editorconfig-checker -- "${all_files[@]}"; then
|
if ! editorconfig-checker -- "${all_files[@]}"; then
|
||||||
printf "%b\n" \
|
printf "%b\n" \
|
||||||
|
|
Loading…
Reference in a new issue