Endre fra pre-commit til pre-push (#6564)

* Endre fra pre-commit til pre-push * lint-staged diff main
navikt · Dec 5, 2024 · 6a70f5f · 6a70f5f
1 parent cf5f449
commit 6a70f5f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.husky/pre-commit → .husky/pre-push b/.husky/pre-commit → .husky/pre-push
@@ -1,8 +1,8 @@
 cd ./apps/etterlatte-saksbehandling-ui
-yarn lint-staged --cwd ./client
-yarn lint-staged --cwd ./server
+yarn lint-staged --diff origin/main --cwd ./client
+yarn lint-staged --diff origin/main --cwd ./server
 
-changedKotlinFiles=$(git diff --name-only --cached | grep '\.kt[s"]\?$' || true)
+changedKotlinFiles=$(git diff --name-only --cached main | grep '\.kt[s"]\?$' || true)
 
 if [ -n "${changedKotlinFiles-unset}" ]; then
     kotlinversion=$(ktlint -v)
@@ -16,11 +16,11 @@ if [ -n "${changedKotlinFiles-unset}" ]; then
 
     #store the result of the commit in a variable and split into array items with newline
     cd ../../
-    committedFiles=$(git diff --name-only --cached --diff-filter=d)
+    committedFiles=$(git diff --name-only --cached main --diff-filter=d)
     files=$(echo $committedFiles | tr ";" "\\n")
 
     # https://github.com/pinterest/ktlint pre-commit hook
-    git diff --name-only --cached | grep '\.kt[s"]\?$' | xargs ktlint -F
+    git diff --name-only --cached main | grep '\.kt[s"]\?$' | xargs ktlint -F
     echo "✍️ Formatted kotlin files"
 
     #replay items in the commits array and add only those files
@@ -30,6 +30,6 @@ if [ -n "${changedKotlinFiles-unset}" ]; then
     done
 fi
 
-echo "🏆 Files staged"
+echo "🏆 Files linted"
 
 exit 0