summaryrefslogtreecommitdiff
path: root/git/test/test_fun.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-15 16:21:47 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-15 16:21:47 +0100
commit7aba59a2609ec768d5d495dafd23a4bce8179741 (patch)
tree9d999b14a7817b1ceeb23ddd1cded446ace9255c /git/test/test_fun.py
parent9c39afa1f85f3293ad2ccef684ff62bf0a36e73c (diff)
parentff13922f6cfb11128b7651ddfcbbd5cad67e477f (diff)
downloadgitpython-7aba59a2609ec768d5d495dafd23a4bce8179741.tar.gz
Merge branch 'johnsca-sf-master' into 0.3
Merge all fixes from https://github.com/gitpython-developers/GitPython/pull/134
Diffstat (limited to 'git/test/test_fun.py')
-rw-r--r--git/test/test_fun.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 530988ef..096cd368 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -2,7 +2,8 @@ from git.test.lib import *
from git.objects.fun import (
traverse_tree_recursive,
traverse_trees_recursive,
- tree_to_stream
+ tree_to_stream,
+ tree_entries_from_data
)
from git.index.fun import (
@@ -249,3 +250,7 @@ class TestFun(TestBase):
entries = traverse_tree_recursive(odb, commit.tree.binsha, '')
assert entries
# END for each commit
+
+ def test_tree_entries_from_data(self):
+ r = tree_entries_from_data(b'100644 \x9f\0aaa')
+ assert r == [('aaa', 33188, '\x9f')], r