teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

pre-commit hook: only format modified lines

Browse source 
instead of entire files
This commit is contained in:
teutat3s 2022-04-09 15:46:51 +02:00
parent 03e6c47086
commit b911badb8a
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shell/hooks/pre-commit.sh
View file

@ -5,7 +5,7 @@ then
against=HEAD against=HEAD
else else
# Initial commit: diff against an empty tree object # Initial commit: diff against an empty tree object
against=$(${git}/bin/git hash-object -t tree /dev/null) against=$(git hash-object -t tree /dev/null)
fi fi
diff="git diff-index --name-only --cached $against --diff-filter d" diff="git diff-index --name-only --cached $against --diff-filter d"
@ -15,8 +15,19 @@ mapfile -t all_files < <($diff)
# Format staged nix files. # Format staged nix files.
if [[ -n "${nix_files[@]}" ]]; then if [[ -n "${nix_files[@]}" ]]; then
# 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 changes
nixpkgs-fmt "${nix_files[@]}" \ nixpkgs-fmt "${nix_files[@]}" \
&& git add "${nix_files[@]}" && git add "${nix_files[@]}"
# if unstaged changes were stashed reapply to working tree
if [ "$old_stash" != "$new_stash" ]; then
git stash pop --quiet
fi
fi fi
# check editorconfig # check editorconfig