Integrated: 2327: Skip CheckTests.acceptSimpleMerges on older Git

[Pavel Rappo]

On Thu, 11 Jul 2024 23:00:05 GMT, Pavel Rappo <prappo at openjdk.org> wrote:

> Please review this test fix.
> 
> A recently added test fails in environments with Git versions older than 2.36. This is because the test verifies functionality that uses `--remerge-diff` added to [Git 2.36]( https://github.blog/2022-04-18-highlights-from-git-2-36/).
> 
> Note that it's sufficient to conditionally skip the test. We don't need to amend the logic being tested, as bots are run on Git 2.36 or newer. The test assumes 2.36 as the minimum Git version. The test uses the existing functionality provided by `org.openjdk.skara.vcs.git.GitVersion`. Hope, that new dependency is okay.

This pull request has now been integrated.

Changeset: ef1d1712
Author:    Pavel Rappo <prappo at openjdk.org>
Committer: Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/ef1d171211fdf3c24a97bf94735ad53079a0c7c4
Stats:     4 lines in 2 files changed: 4 ins; 0 del; 0 mod

2327: Skip CheckTests.acceptSimpleMerges on older Git

Reviewed-by: zsong, erikj

-------------

PR: https://git.openjdk.org/skara/pull/1677