diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-02-25 07:42:04 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2016-02-25 07:42:04 +0100 |
| commit | 8e9481b4ddd70cf44ad041fba771ca5c02b84cf7 (patch) | |
| tree | 3348c6ed13431c2184eb8e4f5958495f0294d99d /git | |
| parent | 9f4af7c6db25c5bbec7fdc8dfc0ea6803350d94c (diff) | |
| parent | 1815563ec44868121ae7fa0f09e3f23cacbb2700 (diff) | |
| download | gitpython-8e9481b4ddd70cf44ad041fba771ca5c02b84cf7.tar.gz | |
Merge pull request #385 from yarikoptic/skip-test
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' |