hooks/precommit: Use a trap to pop the Git stash.

jpds-zz · jpds-zz · commit f19b1c81331a · 2013-10-13T00:13:30.000Z
diff --git a/hooks/precommit b/hooks/precommit
@@ -8,6 +8,8 @@
 echo "$(date -R): Stashing unrelated changes in Git..."
 git stash -q --keep-index
 
+trap 'echo "$(date -R): Reverting Git stash..."; git stash pop -q' EXIT
+
 # Only run tests if our rulesets have been changed.
 RULESET_PATTERN="src/chrome/content/rules/"
 CHANGED_RULESETS="$(git diff --cached --name-only | grep $RULESET_PATTERN)"
@@ -27,7 +29,4 @@ else
         "$RULESET_PATTERN."
 fi
 
-echo "$(date -R): Reverting Git stash..."
-git stash pop -q
-
 exit $RESULT
