diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-05-05 15:25:11 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-05-05 15:25:11 +0200 |
| commit | 9fc7b9a068189cc0d249d0870dfb0112ab5dec92 (patch) | |
| tree | 3e185c8d5028abd4dda32c14744a771f4da088e0 /git/index/base.py | |
| parent | 3fe1a7f87d511758adf2e56803cb3610b80c5f08 (diff) | |
| download | GitPython-9fc7b9a068189cc0d249d0870dfb0112ab5dec92.tar.gz GitPython-9fc7b9a068189cc0d249d0870dfb0112ab5dec92.zip | |
Made most primal imports work, but stopped here as there are many more changes when doing the merge
Diffstat (limited to 'git/index/base.py')
| -rw-r--r-- | git/index/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git/index/base.py b/git/index/base.py index 88410e20..7f3db35d 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -63,7 +63,7 @@ from fun import ( ) from gitdb.base import IStream -from gitdb.db import MemoryDB +from gitdb.db.py import PureMemoryDB from gitdb.util import to_bin_sha from itertools import izip @@ -512,7 +512,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): :raise UnmergedEntriesError: """ # we obtain no lock as we just flush our contents to disk as tree # If we are a new index, the entries access will load our data accordingly - mdb = MemoryDB() + mdb = PureMemoryDB() entries = self._entries_sorted() binsha, tree_items = write_tree_from_cache(entries, mdb, slice(0, len(entries))) |