post-commit git hook incorrectly stashes unstaged changes about capa HOT 3 CLOSED

You shouldn't have to do this manually. It is being restored in the hook:
git stash pop -q --index
https://github.com/fireeye/capa/blob/master/scripts/hooks/pre-push#L14

The only case in which the changes are not restored is if you manually abort while the hook is running. Could this have been the case? There is a warning printing the message used to stash the changes in case it is needed to restore it manually:

"Uncommited changes stashed with message '$MSG', if you abort before they are restored run \`git stash pop\`"

https://github.com/fireeye/capa/blob/master/scripts/hooks/pre-push#L9

If you didn't abort manually, could you provide more details about when this happens (for example the git version you have installed)?

from capa.

i think my expectations were probably just different from those of the hooks. i've modified my hooks to be very minimal. for now, lets call this PEBKAC!

from capa.

@williballenthin I was looking at pre-push when I first read the issue. I think you are right: There is a bug in post-commit which prevent the changes from being restored. Sorry for that. I'll send a PR to fix it.

from capa.