From f21777b1fbe69d747e84f0a7bd5eed85a62f576e Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 20 Oct 2025 20:55:35 -0500
Subject: [PATCH] fix: fixed pre and post commit hook behavior

---
 .hooks/post-commit      | 10 +++++++++-
 .hooks/post-merge       | 26 ++++++++++++++++++++------
 .hooks/pre-commit       | 24 +++++++++++++++++-------
 .hooks/pre-merge-commit |  4 ++--
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/.hooks/post-commit b/.hooks/post-commit
index 56c439d..03a160d 100755
--- a/.hooks/post-commit
+++ b/.hooks/post-commit
@@ -3,4 +3,12 @@
 
 echo "restoring stashed changes"
 
-git stash pop -q
+# Find the most recent pre-commit stash and restore it
+recent_stash=$(git stash list | grep "pre-commit-stash-" | head -n 1 | cut -d: -f1)
+
+if [ -n "$recent_stash" ]; then
+    echo "Found recent pre-commit stash: $recent_stash"
+    git stash pop -q "$recent_stash"
+else
+    echo "No pre-commit stash found to restore"
+fi
diff --git a/.hooks/post-merge b/.hooks/post-merge
index 11fb20c..06fabc3 100755
--- a/.hooks/post-merge
+++ b/.hooks/post-merge
@@ -4,14 +4,28 @@
 # Get current branch name
 current_branch=$(git branch --show-current)
 
-# Only restore stash if we're on main branch and a merge just completed
+# Only perform actions if we're on main branch and a merge just completed
 if [ "$current_branch" = "main" ]; then
-    # Check if there are any stashes to restore
-    if git stash list | grep -q "stash@"; then
-        echo "Post-merge: restoring stashed changes on main branch"
-        git stash pop -q
+    echo "Post-merge on main branch - running nix flake check"
+    
+    # Run nix flake check after merge into main
+    nix flake check
+    
+    if [ ! $? -eq 0 ]; then
+        echo "Warning: nix flake check failed after merge into main"
+        echo "Please fix the issues as soon as possible"
     else
-        echo "Post-merge: no stash to restore on main branch"
+        echo "nix flake check passed after merge"
+    fi
+    
+    # Check if there are any pre-commit stashes to restore
+    recent_stash=$(git stash list | grep "pre-commit-stash-" | head -n 1 | cut -d: -f1)
+    
+    if [ -n "$recent_stash" ]; then
+        echo "Post-merge: restoring pre-commit stash on main branch"
+        git stash pop -q "$recent_stash"
+    else
+        echo "Post-merge: no pre-commit stash to restore on main branch"
     fi
 else
     echo "Post-merge: no action needed on branch '$current_branch'"
diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index f98c64f..74cbc64 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -1,14 +1,24 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash ../shell.nix
 
-echo "stashing all uncommitted changes"
-git stash -q --keep-index
+# Get current branch name
+current_branch=$(git branch --show-current)
 
-echo "checking flakes all compile"
-nix flake check
+echo "stashing all uncommitted changes with named stash (excluding hooks)"
+git stash push -q --keep-index -m "pre-commit-stash-$(date +%s)" -- ':!.hooks/'
 
-if [ ! $? -eq 0 ]; then
-    exit 1
+# Only run nix flake check if we're on main branch
+if [ "$current_branch" = "main" ]; then
+    echo "On main branch - checking flakes all compile"
+    nix flake check
+
+    if [ ! $? -eq 0 ]; then
+        echo "Error: nix flake check failed on main branch"
+        exit 1
+    fi
+    echo "nix flake check passed"
+else
+    echo "Not on main branch - skipping nix flake check"
 fi
 
 echo "running linter"
@@ -19,4 +29,4 @@ RESULT=$?
 echo "adding lint changes to commit"
 git add -u
 
-exit $RESULT
\ No newline at end of file
+exit $RESULT
diff --git a/.hooks/pre-merge-commit b/.hooks/pre-merge-commit
index 9edaf92..9b7b41d 100755
--- a/.hooks/pre-merge-commit
+++ b/.hooks/pre-merge-commit
@@ -17,8 +17,8 @@ fi
 if [ "$target_branch" = "main" ]; then
     echo "Merging into main branch - running nix flake check..."
     
-    echo "stashing all uncommitted changes"
-    git stash -q --keep-index
+    echo "stashing all uncommitted changes with named stash (excluding hooks)"
+    git stash push -q --keep-index -m "pre-merge-stash-$(date +%s)" -- ':!.hooks/'
 
     echo "checking flakes all compile"
     nix flake check