summaryrefslogtreecommitdiff
path: root/lib/git/utils.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-22 12:03:53 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-22 12:03:53 +0200
commit778234d544b3f58dd415aaf10679d15b01a5281f (patch)
tree57e86ae1ca34f7e3e658b1f078f705ba1b397c10 /lib/git/utils.py
parent91725f0fc59aa05ef68ab96e9b29009ce84668a5 (diff)
parentc4f49fb232acb2c02761a82acc12c4040699685d (diff)
downloadgitpython-778234d544b3f58dd415aaf10679d15b01a5281f.tar.gz
Merge branch 'writetree'
Diffstat (limited to 'lib/git/utils.py')
-rw-r--r--lib/git/utils.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/git/utils.py b/lib/git/utils.py
index 3fb7fbf8..38501292 100644
--- a/lib/git/utils.py
+++ b/lib/git/utils.py
@@ -10,12 +10,14 @@ import time
import tempfile
from gitdb.util import (
- make_sha,
- FDStreamWrapper,
- LockedFD,
- file_contents_ro,
- LazyMixin
- )
+ make_sha,
+ FDStreamWrapper,
+ LockedFD,
+ file_contents_ro,
+ LazyMixin,
+ to_hex_sha,
+ to_bin_sha
+ )
def stream_copy(source, destination, chunk_size=512*1024):