Re: pre-commit hook not run on conflict resolution during rebase

2015-05-29 Thread Stefan Haller
Junio C Hamano gits...@pobox.com wrote: li...@haller-berlin.de (Stefan Haller) writes: I guess the next best solution would be to also have a pre-push hook that performs the same checks again, just in case the bad code managed to get past the pre-commit hook for some reason or other.

Re: pre-commit hook not run on conflict resolution during rebase

2015-05-28 Thread Junio C Hamano
li...@haller-berlin.de (Stefan Haller) writes: When a rebase stops because of a conflict, and I edit the file to resolve the conflict and say git rebase --continue, then the pre-commit hook doesn't run at that point,... From glancing through the githooks manpage, I couldn't see any other

pre-commit hook not run on conflict resolution during rebase

2015-05-28 Thread Stefan Haller
When a rebase stops because of a conflict, and I edit the file to resolve the conflict and say git rebase --continue, then the pre-commit hook doesn't run at that point, which means that I can commit bad stuff which the pre-commit hook would normally not allow in. We were bitten by this a few