diff options
| author | Yaroslav Halchenko <debian@onerussian.com> | 2016-02-05 19:59:43 -0500 |
|---|---|---|
| committer | Yaroslav Halchenko <debian@onerussian.com> | 2016-02-14 12:25:48 -0500 |
| commit | 1815563ec44868121ae7fa0f09e3f23cacbb2700 (patch) | |
| tree | b40683db817ba1def1842c2a99ce02a84f4d50a4 /git | |
| parent | ad3931357e5bb01941b50482b4b53934c0b715e3 (diff) | |
| download | gitpython-1815563ec44868121ae7fa0f09e3f23cacbb2700.tar.gz | |
ENH: skip test_is_ancestor on git versions < 1.8.0 not supporting git merge-base --is-ancestor
Diffstat (limited to 'git')
| -rw-r--r-- | git/test/test_repo.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 241b4027..5035cbb9 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -772,6 +772,10 @@ class TestRepo(TestBase): self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff') def test_is_ancestor(self): + git = self.rorepo.git + if git.version_info[:3] < (1, 8, 0): + raise SkipTest("git merge-base --is-ancestor feature unsupported") + repo = self.rorepo c1 = 'f6aa8d1' c2 = '763ef75' |