Remove stashing logic

kgryte · kgryte · commit 1feedd053cdc · 2021-08-18T14:18:27.000-07:00
Using stash was problematic in the sense that suppose you commit
a file and have another unstaged file to which you are making changes.
During the pre-commit hook, all unstaged files are stashed, which
means the unstaged file is reverted back to its original state. So,
if during pre-commit linting, you try and make changes to the
unstaged file, you will encounter a merge conflict once the stashed
changes are restored. Furthermore, I encountered a situation where
during the pre-commit hook, changes were stashed, but not restored.
This seems like a recipe for dev issues.

The problem certainly remains that I can try to commit a file, find
that it fails lint tests, update the file to no longer fail lint tests,
and fail to stage the most recent modifications. At which point, the
pre-commit hook will succeed, giving me a false positive indication
that everything is okay.

In practice, I've found such false positives rare, as, personally,
I do a decent job of staging any changes I make which are needed
to pass pre-commit and pre-push checks.
diff --git a/tools/git/hooks/pre-commit b/tools/git/hooks/pre-commit
@@ -68,16 +68,11 @@ on_error() {
 
 # Runs clean-up tasks.
 cleanup() {
-	# Restore stashed changes to the working tree:
-	git stash pop -q
-
 	echo '' >&2
 }
 
 # Runs initialization tasks.
 init() {
-	# Stash any changes to the working tree that are not going to be committed:
-	git stash -q --keep-index
 	return 0
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,16 +68,11 @@ on_error() {`
`68`	`68`
`69`	`69`	`# Runs clean-up tasks.`
`70`	`70`	`cleanup() {`
`71`		`- # Restore stashed changes to the working tree:`
`72`		`- git stash pop -q`
`73`		`-`
`74`	`71`	`echo '' >&2`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`# Runs initialization tasks.`
`78`	`75`	`init() {`
`79`		`- # Stash any changes to the working tree that are not going to be committed:`
`80`		`- git stash -q --keep-index`
`81`	`76`	`return 0`
`82`	`77`	`}`
`83`	`78`