diff options
Diffstat (limited to 'git/test/test_fun.py')
| -rw-r--r-- | git/test/test_fun.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git/test/test_fun.py b/git/test/test_fun.py index 129df3b9..f435f31b 100644 --- a/git/test/test_fun.py +++ b/git/test/test_fun.py @@ -23,6 +23,7 @@ from stat import ( from git.index import IndexFile from cStringIO import StringIO + class TestFun(TestBase): def _assert_index_entries(self, entries, trees): @@ -78,8 +79,10 @@ class TestFun(TestBase): def test_three_way_merge(self, rwrepo): def mkfile(name, sha, executable=0): return (sha, S_IFREG | 0644 | executable*0111, name) + def mkcommit(name, sha): return (sha, S_IFDIR | S_IFLNK, name) + def assert_entries(entries, num_entries, has_conflict=False): assert len(entries) == num_entries assert has_conflict == (len([e for e in entries if e.stage != 0]) > 0) @@ -156,7 +159,6 @@ class TestFun(TestBase): trees = [tb, th, tm] assert_entries(aggressive_tree_merge(odb, trees), 3, True) - # change mode on same base file, by making one a commit, the other executable # no content change ( this is totally unlikely to happen in the real world ) fa = mkcommit(bfn, shaa) |