Pre commit hooks: Should stash changes before checking

[windaishi]

There is a small problem with the pre commit hooks that happens pretty often to me.
When the commit failes because of a style error in the code and you fix the styles afterwars but forget to use "git add" for this files, the pre commit hook does NOT fail and the files with the code style errors are commited.
I suggest that before every code style check, all changed to files that are not added to commit, should be stashed first. After the code style stash should be poped again.

[fixpunkt]

Yup, that's one option. But I also suggest you get in the habit of using git commit --all instead of adding and then committing.

[samuelvogel]

I do actually propose to individually add all changes while simultaneously reviewing them and deciding what should actually be part of the commit (but here is not the right place to discuss this 😉).

[thomasnordquist]

To prevent this to occur, we could add a "dirty" check in our pre-push hook.
"dirty repo" => repo has unstaged changes

I would propose to use git diff --shortstat to list changes in managed changes (so that unmanaged files won't mark a repo as dirty):
https://stackoverflow.com/questions/2657935/checking-for-a-dirty-index-or-untracked-files-with-git

Example for pre-push hook:

if [ "`git diff --shortstat`" != "" ]; then
  echo "The current branch is dirty, commit/stash all your changes before git push";
  exit 1;
fi;

Edit: replaced pre-commit with pre-push

[fixpunkt]

I do actually propose to individually add all changes while simultaneously reviewing them and deciding what should actually be part of the commit (but here is not the right place to discuss this 😉).

I review changes before running git commit -a and then review the diff shown in the commit editor again...