summaryrefslogtreecommitdiff
path: root/git/refs/log.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-06-07 21:36:42 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-06-07 21:36:42 +0200
commit58a930a632c867b65b9a3802e2f4190cf32e33ee (patch)
tree95b1311a3a4bfcdf4c2dba66f360e6985184013e /git/refs/log.py
parenta98e0af511b728030c12bf8633b077866bb74e47 (diff)
parentf6897c78be5a5530129df50742cb6cabfb8609c9 (diff)
downloadgitpython-58a930a632c867b65b9a3802e2f4190cf32e33ee.tar.gz
Merge branch 'gitdbmerger'
Diffstat (limited to 'git/refs/log.py')
-rw-r--r--git/refs/log.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/git/refs/log.py b/git/refs/log.py
index f49c07fd..3b9d8514 100644
--- a/git/refs/log.py
+++ b/git/refs/log.py
@@ -5,12 +5,9 @@ from git.util import (
LockFile,
assure_directory_exists,
to_native_path,
- )
-
-from gitdb.util import (
bin_to_hex,
join,
- file_contents_ro_filepath,
+ file_contents_ro_filepath
)
from git.objects.util import (