On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber <git@xxxxxxxxx> wrote: > --- a/t/t7503-pre-commit-hook.sh > +++ b/t/t7503-pre-commit-hook.sh > -test_description='pre-commit hook' > +test_description='pre-commit and pre-merge hooks' Tangent: do we also want to rename the file? > +test_expect_success '--no-verify with succeeding hook (merge)' ' The return value of the hook ought to not matter, so we'd rather want to test for 'no side effect by hook on --no-verify' ? > +test_expect_success '--no-verify with failing hook (merge)' ' > + > + git checkout side && > + git merge --no-verify -m "merge master" master && > + git checkout master > + > +' I assume the same (unsolved) issues apply to this hook as to the commit-msg hook with 'git merge --continue' Do we want a test for that (I am torn on that) ?
