def test_commit_log_history_git(repository_with_merge_commits):
"""Test detection of commit log messages with GitPython."""
pytest.importorskip("git")
commits = _git_commits('HEAD^^..HEAD', repository_with_merge_commits)
assert commits[0].message == "Merge branch 'test'\n"
assert commits[1].message == "master2\n"
assert commits[2].message == "test\n"
def test_merge_commit_detection_git(repository_with_merge_commits):
"""Test detection of merge and non-merge commits with GitPython."""
pytest.importorskip("git")
commits = _git_commits('HEAD^..', repository_with_merge_commits)
first_commit, second_commit = commits
assert _is_merge_commit(first_commit)
assert not _is_merge_commit(second_commit)
def test_commit_log_history_git(repository_with_merge_commits):
"""Test detection of commit log messages with GitPython."""
pytest.importorskip("git")
commits = _git_commits('HEAD^^..HEAD', repository_with_merge_commits)
assert commits[0].message == "Merge branch 'test'\n"
assert commits[1].message == "master2\n"
assert commits[2].message == "test\n"
def test_commit_log_history_git(repository_with_merge_commits):
"""Test detection of commit log messages with GitPython."""
pytest.importorskip("git")
commits = _git_commits('HEAD^^..HEAD', repository_with_merge_commits)
first_commit, second_commit, third_commit = commits
assert first_commit.message == "Merge branch 'test'\n"
assert second_commit.message == "master2\n"
assert third_commit.message == "test\n"
def test_merge_commit_detection_git(repository_with_merge_commits):
"""Test detection of merge and non-merge commits with GitPython."""
pytest.importorskip("git")
commits = _git_commits('HEAD^..', repository_with_merge_commits)
assert _is_merge_commit(commits[0])
assert not _is_merge_commit(commits[1])