Re: [PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge
- Date: Fri, 13 Apr 2018 14:03:03 -0700
- From: Stefan Beller <sbeller@xxxxxxxxxx>
- Subject: Re: [PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge
On Fri, Apr 13, 2018 at 12:56 PM, Elijah Newren <newren@xxxxxxxxx> wrote:
> Add several tests checking whether updates can be skipped in a merge.
> Also add several similar testcases for where updates cannot be skipped in
> a merge to make sure that we skip if and only if we should.
> In particular:
> * Testcase 1a (particularly 1a-check-L) would have pointed out the
> problem Linus has been dealing with for year with his merges.
> * Testcase 2a (particularly 2a-check-L) would have pointed out the
> problem with my directory-rename-series before it broke master.
> * Testcases 3[ab] (particularly 3a-check-L) provide a simpler testcase
> than 12b of t6043 making that one easier to understand.
> * There are several complementary testcases to make sure we're not just
> fixing those particular issues while regressing in the opposite
>  https://public-inbox.org/git/CA+55aFzLZ3UkG5svqZwSnhNk75=fXJRkvU1m_RHBG54NOoaZPA@xxxxxxxxxxxxxx/
>  https://public-inbox.org/git/xmqqmuya43cs.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
Reviewed-by: Stefan Beller <sbeller@xxxxxxxxxx>
> + test_tick &&
> + git commit -m "O" &&
minor nit: I think you can omit the test_tick before creating O
for each setup.