summaryrefslogtreecommitdiff
path: root/git/db.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-10-22 11:11:25 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-10-22 11:11:25 +0200
commitcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (patch)
tree2f688eb182f2e76091134c47c4a327681c12e15b /git/db.py
parentafcd64ebbb770908bd2a751279ff070dea5bb97c (diff)
parentcc77e6b2862733a211c55cf29cc7a83c36c27919 (diff)
downloadgitpython-caa0ea7a0893fe90ea043843d4e6ad407126d7b8.tar.gz
Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ankostis-cygwin
Diffstat (limited to 'git/db.py')
-rw-r--r--git/db.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/git/db.py b/git/db.py
index 39b9872a..653fa7da 100644
--- a/git/db.py
+++ b/git/db.py
@@ -1,12 +1,9 @@
"""Module with our own gitdb implementation - it uses the git command"""
+from git.util import bin_to_hex, hex_to_bin
from gitdb.base import (
OInfo,
OStream
)
-from gitdb.util import (
- bin_to_hex,
- hex_to_bin
-)
from gitdb.db import GitDB # @UnusedImport
from gitdb.db import LooseObjectDB