From: Stefan Beller <sbeller@google.com>
Date: Fri, 22 Sep 2017 20:01:31 GMT
Subject: Re: [PATCH 4/4] t7503: add tests for pre-merge-hook
Message-ID: <CAGZ79ka3Bejmv=hT2xNAzx0K-r7S8SaTKmgeW9MB1FqhrY31pA@mail.gmail.com>
In-Reply-To: <381fe8facbbc1667d655572fcff5d6eb5f0e07fc.1506081120.git.git@grubix.eu>

On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber <git@grubix.eu> 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) ?