Jul 21, 2015 · Jul 21, 2015
diff --git a/git/repo/base.py b/git/repo/base.py

 returnres

 defis_ancestor(self,ancestor_rev,rev):
 """Check if a commit  is an ancestor of another

        :param ancestor_rev: Rev which should be an ancestor
        :param rev: Rev to test against ancestor_rev
        :return: ``True``, ancestor_rev is an accestor to rev.
        """
 try:
 self.git.merge_base(ancestor_rev,rev,is_ancestor=True)
 exceptGitCommandErroraserr:
 iferr.status==1:
 returnFalse
 raise
 returnTrue

 def_get_daemon_export(self):
 filename=join(self.git_dir,self.DAEMON_EXPORT_FILE)
 returnos.path.exists(filename)
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
 import sys
 import tempfile
 import shutil
 import itertools
 from io import BytesIO



        # Test for no merge base - can't do as we have
        self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff')

    def test_is_ancestor(self):
        repo = self.rorepo
        c1 = 'f6aa8d1'
        c2 = '763ef75'
        self.assertTrue(repo.is_ancestor(c1, c1))
        self.assertTrue(repo.is_ancestor("master", "master"))
        self.assertTrue(repo.is_ancestor(c1, c2))
        self.assertTrue(repo.is_ancestor(c1, "master"))
        self.assertFalse(repo.is_ancestor(c2, c1))
        self.assertFalse(repo.is_ancestor("master", c1))
        for i, j in itertools.permutations([c1, 'ffffff', ''], r=2):
            self.assertRaises(GitCommandError, repo.is_ancestor, i, j)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -504,6 +504,21 @@ def merge_base(self, rev, *kwargs):

		returnres

		defis_ancestor(self,ancestor_rev,rev):
		"""Check if a commit is an ancestor of another

		:param ancestor_rev: Rev which should be an ancestor
		:param rev: Rev to test against ancestor_rev
		:return: ``True``, ancestor_rev is an accestor to rev.
		"""
		try:
		self.git.merge_base(ancestor_rev,rev,is_ancestor=True)
		exceptGitCommandErroraserr:
		iferr.status==1:
		returnFalse
		raise
		returnTrue

		def_get_daemon_export(self):
		filename=join(self.git_dir,self.DAEMON_EXPORT_FILE)
		returnos.path.exists(filename)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,6 +42,7 @@
		import sys
		import tempfile
		import shutil
		import itertools
		from io import BytesIO


Expand DownExpand Up		@@ -765,3 +766,16 @@ def test_merge_base(self):

		# Test for no merge base - can't do as we have
		self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff')

		def test_is_ancestor(self):
		repo = self.rorepo
		c1 = 'f6aa8d1'
		c2 = '763ef75'
		self.assertTrue(repo.is_ancestor(c1, c1))
		self.assertTrue(repo.is_ancestor("master", "master"))
		self.assertTrue(repo.is_ancestor(c1, c2))
		self.assertTrue(repo.is_ancestor(c1, "master"))
		self.assertFalse(repo.is_ancestor(c2, c1))
		self.assertFalse(repo.is_ancestor("master", c1))
		for i, j in itertools.permutations([c1, 'ffffff', ''], r=2):
		self.assertRaises(GitCommandError, repo.is_ancestor, i, j)