replaced all gitdb strings with git

52 files changed, 148 insertions, 144 deletions

diff --git a/git/db/cmd/git.py b/git/db/cmd/git.py
index 5f977c6f..6c060f0e 100644
--- a/git/db/cmd/git.py
+++ b/git/db/cmd/git.py
@@ -1,29 +1,29 @@
-"""Module with our own gitdb implementation - it uses the git command"""
+"""Module with our own git implementation - it uses the git command"""
 from exc import (
 					GitCommandError, 
 					BadObject
 				)
 
-from gitdb.base import (
+from git.base import (
 								OInfo,
 								OStream
 							)
 
-from gitdb.util import (
+from git.util import (
 							bin_to_hex, 
 							hex_to_bin
 						)
-from gitdb.db.py import (
+from git.db.py import (
 						PureGitDB,
 						PureLooseObjectODB
 					)
 from git.util import RemoteProgress
-from gitdb.db.py.base import TransportDB
-from gitdb.db.interface import FetchInfo as GitdbFetchInfo
-from gitdb.db.interface import PushInfo as GitdbPushInfo
+from git.db.py.base import TransportDB
+from git.db.interface import FetchInfo as GitdbFetchInfo
+from git.db.interface import PushInfo as GitdbPushInfo
 
 from git.util import  join_path
-from gitdb.util import join
+from git.util import join
 
 from refs import (
 					Reference,
diff --git a/git/db/py/base.py b/git/db/py/base.py
index c378b10e..28bbf258 100644
--- a/git/db/py/base.py
+++ b/git/db/py/base.py
@@ -4,9 +4,9 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains basic implementations for the interface building blocks"""
 
-from gitdb.db.interface import *
+from git.db.interface import *
 
-from gitdb.util import (
+from git.util import (
 		pool,
 		join,
 		normpath,
@@ -21,8 +21,8 @@ from gitdb.util import (
 		is_git_dir
 	)
 
-from gitdb.config import GitConfigParser
-from gitdb.exc import 	(
+from git.config import GitConfigParser
+from git.exc import 	(
 						BadObject, 
 						AmbiguousObjectName,
 						InvalidDBRoot
diff --git a/git/db/py/git.py b/git/db/py/git.py
index bc148c6f..1f929e31 100644
--- a/git/db/py/git.py
+++ b/git/db/py/git.py
@@ -16,13 +16,13 @@ from loose import PureLooseObjectODB
 from pack import PurePackedODB
 from ref import PureReferenceDB
 
-from gitdb.util import (
+from git.util import (
 						LazyMixin, 
 						normpath,
 						join,
 						dirname
 					)
-from gitdb.exc import (
+from git.exc import (
 						InvalidDBRoot, 
 						BadObject, 
 						AmbiguousObjectName
diff --git a/git/db/py/loose.py b/git/db/py/loose.py
index 34e31da6..56915f18 100644
--- a/git/db/py/loose.py
+++ b/git/db/py/loose.py
@@ -9,25 +9,25 @@ from base import (
 				)
 
 
-from gitdb.exc import (
+from git.exc import (
 	InvalidDBRoot, 
 	BadObject,
 	AmbiguousObjectName
 	)
 
-from gitdb.stream import (
+from git.stream import (
 		DecompressMemMapReader,
 		FDCompressedSha1Writer,
 		FDStream,
 		Sha1Writer
 	)
 
-from gitdb.base import (
+from git.base import (
 							OStream,
 							OInfo
 						)
 
-from gitdb.util import (
+from git.util import (
 		file_contents_ro_filepath,
 		ENOENT,
 		hex_to_bin,
@@ -44,7 +44,7 @@ from gitdb.util import (
 		join
 	)
 
-from gitdb.fun import ( 
+from git.fun import ( 
 	chunk_size,
 	loose_object_header_info, 
 	write_object,
diff --git a/git/db/py/mem.py b/git/db/py/mem.py
index ba922e96..5851aebc 100644
--- a/git/db/py/mem.py
+++ b/git/db/py/mem.py
@@ -9,16 +9,16 @@ from base import (
 						PureObjectDBW
 					)
 
-from gitdb.base import (
+from git.base import (
 							OStream,
 							IStream,
 						)
 
-from gitdb.exc import (
+from git.exc import (
 						BadObject,
 						UnsupportedOperation
 						)
-from gitdb.stream import (
+from git.stream import (
 							ZippedStoreShaWriter,
 							DecompressMemMapReader,
 						)
diff --git a/git/db/py/pack.py b/git/db/py/pack.py
index 1d0e9bfc..75b75468 100644
--- a/git/db/py/pack.py
+++ b/git/db/py/pack.py
@@ -3,21 +3,21 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module containing a database to deal with packs"""
-from gitdb.db import CachingDB
+from git.db import CachingDB
 from base import (
 						PureRootPathDB, 
 						PureObjectDBR 
 				)
 
-from gitdb.util import LazyMixin
+from git.util import LazyMixin
 
-from gitdb.exc import (
+from git.exc import (
 							BadObject,
 							UnsupportedOperation,
 							AmbiguousObjectName
 						)
 
-from gitdb.pack import PackEntity
+from git.pack import PackEntity
 
 import os
 import glob
diff --git a/git/db/py/resolve.py b/git/db/py/resolve.py
index 86c1e594..7c03bcd1 100644
--- a/git/db/py/resolve.py
+++ b/git/db/py/resolve.py
@@ -1,11 +1,11 @@
 """Module with an implementation for refspec parsing. It is the pure-python
 version assuming compatible interface for reference and object types"""
 
-from gitdb.db.interface import ReferencesMixin
-from gitdb.exc import BadObject
-from gitdb.ref import SymbolicReference
-from gitdb.object.base import Object
-from gitdb.util import (
+from git.db.interface import ReferencesMixin
+from git.exc import BadObject
+from git.ref import SymbolicReference
+from git.object.base import Object
+from git.util import (
 							join,
 							isdir, 
 							isfile,
diff --git a/git/db/py/transport.py b/git/db/py/transport.py
index 783fb8d5..f8edfb23 100644
--- a/git/db/py/transport.py
+++ b/git/db/py/transport.py
@@ -4,7 +4,7 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Implement a transport compatible database which sends objects using the git protocol"""
 
-from gitdb.db.interface import ( TransportDB, 
+from git.db.interface import ( TransportDB, 
 								PushInfo,
 								FetchInfo,
 								RefSpec )
diff --git a/git/diff.py b/git/diff.py
index 7b3bf6b5..d1c6c0ac 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -9,7 +9,7 @@ from objects.blob import Blob
 from objects.util import mode_str_to_int 
 from exc import GitCommandError
 
-from gitdb.util import hex_to_bin
+from git.util import hex_to_bin
 
 	
 __all__ = ('Diffable', 'DiffIndex', 'Diff')
diff --git a/git/index/base.py b/git/index/base.py
index 7f3db35d..06917b0e 100644
--- a/git/index/base.py
+++ b/git/index/base.py
@@ -62,9 +62,9 @@ from fun import (
 					S_IFGITLINK
 				)
 
-from gitdb.base import IStream
-from gitdb.db.py import PureMemoryDB
-from gitdb.util import to_bin_sha
+from git.base import IStream
+from git.db.py import PureMemoryDB
+from git.util import to_bin_sha
 from itertools import izip
 
 __all__ = ( 'IndexFile', 'CheckoutError' )
diff --git a/git/index/fun.py b/git/index/fun.py
index 9b35bf04..e2813c0b 100644
--- a/git/index/fun.py
+++ b/git/index/fun.py
@@ -36,8 +36,8 @@ from util import 	(
 					unpack
 					)
 
-from gitdb.base import IStream
-from gitdb.typ import str_tree_type
+from git.base import IStream
+from git.typ import str_tree_type
 
 __all__ = ('write_cache', 'read_cache', 'write_tree_from_cache', 'entry_key', 
 			'stat_mode_to_index_mode', 'S_IFGITLINK')
diff --git a/git/objects/blob.py b/git/objects/blob.py
index 326c5459..9c51f99f 100644
--- a/git/objects/blob.py
+++ b/git/objects/blob.py
@@ -6,7 +6,7 @@
 
 from git.util import RepoAliasMixin
 from mimetypes import guess_type
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
 
 import base
 
diff --git a/git/objects/commit.py b/git/objects/commit.py
index 30dcaa0a..4ca5877e 100644
--- a/git/objects/commit.py
+++ b/git/objects/commit.py
@@ -5,11 +5,11 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import base
 
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
 from tree import Tree
 from cStringIO import StringIO
 
-from gitdb.util import (
+from git.util import (
 						hex_to_bin,
 						Actor,
 						RepoAliasMixin,
@@ -24,7 +24,7 @@ from util import (
 					parse_actor_and_date
 				)
 from git.diff import Diffable
-from gitdb.base import IStream
+from git.base import IStream
 from cStringIO import StringIO
 
 from util import parse_date
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index 9b45d9b6..f6cf278a 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -1,5 +1,5 @@
 from git.util import RepoAliasMixin
-from gitdb.object.submodule import Submodule as GitDB_Submodule
+from git.object.submodule import Submodule as GitDB_Submodule
 import util
 from util import (
 					mkhead,
diff --git a/git/objects/tag.py b/git/objects/tag.py
index 0bd1d20c..5dcd9bf9 100644
--- a/git/objects/tag.py
+++ b/git/objects/tag.py
@@ -6,12 +6,12 @@
 """ Module containing all object based types. """
 import base
 from git.util import RepoAliasMixin
-from gitdb.util import hex_to_bin
+from git.util import hex_to_bin
 from util import (
 					get_object_type_by_name,
 					parse_actor_and_date
 				)
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
 
 __all__ = ("TagObject", )
 
diff --git a/git/objects/tree.py b/git/objects/tree.py
index 1b5f7561..689aeaf6 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 from git.util import RepoAliasMixin
 import git.diff as diff
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
 from base import IndexObject
 from blob import Blob
 from submodule import Submodule
@@ -15,7 +15,7 @@ from fun import (
 					tree_to_stream
 				 )
 
-from gitdb.util import (
+from git.util import (
 						to_bin_sha,
 						join_path
 						)
diff --git a/git/odict.py b/git/odict.py
index 75a5c6df..ff8b955b 100644
--- a/git/odict.py
+++ b/git/odict.py
@@ -23,5 +23,5 @@ __revision__ = '$Id: odict.py 129 2005-09-12 18:15:28Z teknico $'
 __version__ = '0.2.2'
 
 # imported for backward compatibility only
-from gitdb.odict import OrderedDict, SequenceOrderedDict
+from git.odict import OrderedDict, SequenceOrderedDict
 __all__ = ['OrderedDict', 'SequenceOrderedDict']
diff --git a/git/pack.py b/git/pack.py
index 7ae9786e..62e9ae03 100644
--- a/git/pack.py
+++ b/git/pack.py
@@ -3,7 +3,7 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Contains PackIndexFile and PackFile implementations"""
-from gitdb.exc import (
+from git.exc import (
 						BadObject,
 						UnsupportedOperation,
 						ParseError
diff --git a/git/refs/headref.py b/git/refs/headref.py
index 6fb7fea1..67117e96 100644
--- a/git/refs/headref.py
+++ b/git/refs/headref.py
@@ -1,6 +1,6 @@
 from reference import Reference
-from gitdb.config import SectionConstraint
-from gitdb.util import join_path
+from git.config import SectionConstraint
+from git.util import join_path
 
 __all__ = ["Head"]
 
diff --git a/git/refs/log.py b/git/refs/log.py
index 3aa0b4a3..2028efb9 100644
--- a/git/refs/log.py
+++ b/git/refs/log.py
@@ -1,4 +1,4 @@
-from gitdb.util import (
+from git.util import (
 						join_path,
 						Actor,
 						LockedFD,
@@ -10,7 +10,7 @@ from gitdb.util import (
 						file_contents_ro_filepath
 					)
 
-from gitdb.object.util import (
+from git.object.util import (
 								parse_date,
 								Serializable, 
 								utctz_to_altz,
diff --git a/git/refs/reference.py b/git/refs/reference.py
index 6373cb3e..838a29e3 100644
--- a/git/refs/reference.py
+++ b/git/refs/reference.py
@@ -2,7 +2,7 @@ import os
 
 from symbolic import SymbolicReference
 from head import HEAD
-from gitdb.util import (
+from git.util import (
 							LazyMixin, 
 							Iterable,
 							isfile,
diff --git a/git/refs/remote.py b/git/refs/remote.py
index bfe80e62..b883b00b 100644
--- a/git/refs/remote.py
+++ b/git/refs/remote.py
@@ -1,6 +1,6 @@
 import os
 from headref import Head
-from gitdb.util import (
+from git.util import (
 						join, 
 						join_path
 						)
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
index 70cfc7d6..847c563d 100644
--- a/git/refs/symbolic.py
+++ b/git/refs/symbolic.py
@@ -1,11 +1,11 @@
 import os
 import re
 
-from gitdb.object import (
+from git.object import (
 						Object, 
 						Commit
 						)
-from gitdb.util import (
+from git.util import (
 					join_path, 
 					join_path_native, 
 					to_native_path_linux,
@@ -20,7 +20,7 @@ from gitdb.util import (
 					LockedFD
 					)
 
-from gitdb.exc import BadObject
+from git.exc import BadObject
 from log import RefLog
 
 __all__ = ["SymbolicReference"]
diff --git a/git/refs/tag.py b/git/refs/tag.py
index 24a8e768..7a0caa48 100644
--- a/git/refs/tag.py
+++ b/git/refs/tag.py
@@ -1,4 +1,4 @@
-from gitdb.ref.tag import TagReference as GitDB_TagReference
+from git.ref.tag import TagReference as GitDB_TagReference
 
 __all__ = ["TagReference", "Tag"]
 
diff --git a/git/repo/base.py b/git/repo/base.py
index 29916986..45deac78 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -18,7 +18,7 @@ from git.db import (
 				)
 
 
-from gitdb.util import (
+from git.util import (
 							join,
 							isfile,
 							hex_to_bin
diff --git a/git/repo/fun.py b/git/repo/fun.py
index 7529897d..604d5bc0 100644
--- a/git/repo/fun.py
+++ b/git/repo/fun.py
@@ -1,6 +1,6 @@
 """Package with general repository related functions"""
 import os
-from gitdb.util import is_git_dir
+from git.util import is_git_dir
 
 __all__ = ('is_git_dir', 'touch')
 
diff --git a/git/test/__init__.py b/git/test/__init__.py
index 63d25743..a29d96a7 100644
--- a/git/test/__init__.py
+++ b/git/test/__init__.py
@@ -4,11 +4,11 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-import gitdb.util
+import git.util
 
 def _init_pool():
 	"""Assure the pool is actually threaded"""
 	size = 2
 	print "Setting ThreadPool to %i" % size
-	gitdb.util.pool.set_size(size)
+	git.util.pool.set_size(size)
 
diff --git a/git/test/db/lib.py b/git/test/db/lib.py
index 5f4f9c36..bd230eda 100644
--- a/git/test/db/lib.py
+++ b/git/test/db/lib.py
@@ -3,7 +3,7 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Base classes for object db testing"""
-from gitdb.test.lib import (
+from git.test.lib import (
 	with_rw_directory,
 	with_packs_rw,
 	ZippedStoreShaWriter,
@@ -11,20 +11,20 @@ from gitdb.test.lib import (
 	TestBase
 	)
 
-from gitdb.stream import Sha1Writer
+from git.stream import Sha1Writer
 
 # import database types we want to support
 # they will be set to None if the respective library could not be loaded
-from gitdb.db.py import PureGitDB
+from git.db.py import PureGitDB
 
-from gitdb.base import (
+from git.base import (
 							IStream,
 							OStream,
 							OInfo
 						)
 				
-from gitdb.exc import BadObject
-from gitdb.typ import str_blob_type
+from git.exc import BadObject
+from git.typ import str_blob_type
 
 from async import IteratorReader
 from cStringIO import StringIO
diff --git a/git/test/db/test_base.py b/git/test/db/test_base.py
index 0a381beb..1dbf6fe7 100644
--- a/git/test/db/test_base.py
+++ b/git/test/db/test_base.py
@@ -3,7 +3,7 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from lib import *
-from gitdb.db import RefSpec
+from git.db import RefSpec
 
 class TestBase(TestDBBase):
 	
diff --git a/git/test/db/test_git.py b/git/test/db/test_git.py
index 62f33bb1..46a2d24f 100644
--- a/git/test/db/test_git.py
+++ b/git/test/db/test_git.py
@@ -3,10 +3,10 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from lib import *
-from gitdb.exc import BadObject
-from gitdb.db.py import PureGitODB
-from gitdb.base import OStream, OInfo
-from gitdb.util import hex_to_bin, bin_to_hex
+from git.exc import BadObject
+from git.db.py import PureGitODB
+from git.base import OStream, OInfo
+from git.util import hex_to_bin, bin_to_hex
 		
 class TestGitDB(TestDBBase):
 	
@@ -17,9 +17,9 @@ class TestGitDB(TestDBBase):
 		assert 1 < len(gdb.databases()) < 4
 		
 		# access should be possible
-		gitdb_sha = hex_to_bin("5690fd0d3304f378754b23b098bd7cb5f4aa1976")
-		assert isinstance(gdb.info(gitdb_sha), OInfo)
-		assert isinstance(gdb.stream(gitdb_sha), OStream)
+		git_sha = hex_to_bin("5690fd0d3304f378754b23b098bd7cb5f4aa1976")
+		assert isinstance(gdb.info(git_sha), OInfo)
+		assert isinstance(gdb.stream(git_sha), OStream)
 		assert gdb.size() > 200
 		sha_list = list(gdb.sha_iter())
 		assert len(sha_list) == gdb.size()
diff --git a/git/test/db/test_loose.py b/git/test/db/test_loose.py
index b1d33fd6..16c12d8e 100644
--- a/git/test/db/test_loose.py
+++ b/git/test/db/test_loose.py
@@ -3,9 +3,9 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from lib import *
-from gitdb.db.py import PureLooseObjectODB
-from gitdb.exc import BadObject
-from gitdb.util import bin_to_hex
+from git.db.py import PureLooseObjectODB
+from git.exc import BadObject
+from git.util import bin_to_hex
 		
 class TestLooseDB(TestDBBase):
 	
diff --git a/git/test/db/test_mem.py b/git/test/db/test_mem.py
index 79005b50..ed14cc21 100644
--- a/git/test/db/test_mem.py
+++ b/git/test/db/test_mem.py
@@ -3,7 +3,7 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from lib import *
-from gitdb.db.py import (
+from git.db.py import (
 						PureMemoryDB,
 						PureLooseObjectODB
 					)
diff --git a/git/test/db/test_pack.py b/git/test/db/test_pack.py
index 5456df41..4854c4e7 100644
--- a/git/test/db/test_pack.py
+++ b/git/test/db/test_pack.py
@@ -3,10 +3,10 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from lib import *
-from gitdb.db.py import PurePackedODB
-from gitdb.test.lib import fixture_path
+from git.db.py import PurePackedODB
+from git.test.lib import fixture_path
 
-from gitdb.exc import BadObject, AmbiguousObjectName
+from git.exc import BadObject, AmbiguousObjectName
 
 import os
 import random
diff --git a/git/test/db/test_ref.py b/git/test/db/test_ref.py
index 330dab70..43fbb48f 100644
--- a/git/test/db/test_ref.py
+++ b/git/test/db/test_ref.py
@@ -3,9 +3,9 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 from lib import *
-from gitdb.db.py import PureReferenceDB
+from git.db.py import PureReferenceDB
 
-from gitdb.util import (
+from git.util import (
 						NULL_BIN_SHA,
 						hex_to_bin
 						)
@@ -44,8 +44,8 @@ class TestPureReferenceDB(TestDBBase):
 		assert len(rdb.databases()) == 1
 		
 		# we should now find a default revision of ours
-		gitdb_sha = hex_to_bin("5690fd0d3304f378754b23b098bd7cb5f4aa1976")
-		assert rdb.has_object(gitdb_sha)
+		git_sha = hex_to_bin("5690fd0d3304f378754b23b098bd7cb5f4aa1976")
+		assert rdb.has_object(git_sha)
 		
 		# remove valid
 		self.make_alt_file(alt_path, ["just/one/invalid/path"])
diff --git a/git/test/lib/base.py b/git/test/lib/base.py
index 9224f5f6..9ed2c4b2 100644
--- a/git/test/lib/base.py
+++ b/git/test/lib/base.py
@@ -3,14 +3,14 @@
 # This module is part of PureGitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Utilities used in ODB testing"""
-from gitdb import OStream
-from gitdb.db.py import PureGitDB
-from gitdb.stream import ( 
+from git import OStream
+from git.db.py import PureGitDB
+from git.stream import ( 
 							Sha1Writer, 
 							ZippedStoreShaWriter
 						)
 
-from gitdb.util import zlib
+from git.util import zlib
 
 import sys
 import random
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
index ad30d4c4..edf833d7 100644
--- a/git/test/lib/helper.py
+++ b/git/test/lib/helper.py
@@ -12,7 +12,7 @@ import tempfile
 import shutil
 import cStringIO
 
-from gitdb.test.lib import maketemp 
+from git.test.lib import maketemp 
 
 GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
 
diff --git a/git/test/objects/test_blob.py b/git/test/objects/test_blob.py
index 661c0501..7041010f 100644
--- a/git/test/objects/test_blob.py
+++ b/git/test/objects/test_blob.py
@@ -6,7 +6,7 @@
 
 from git.test.lib import *
 from git import *
-from gitdb.util import hex_to_bin
+from git.util import hex_to_bin
 
 class TestBlob(TestBase):
 	
diff --git a/git/test/objects/test_commit.py b/git/test/objects/test_commit.py
index 4a8d8b87..b2cc5b27 100644
--- a/git/test/objects/test_commit.py
+++ b/git/test/objects/test_commit.py
@@ -7,8 +7,8 @@
 
 from git.test.lib import *
 from git import *
-from gitdb import IStream
-from gitdb.util import hex_to_bin
+from git import IStream
+from git.util import hex_to_bin
 
 from cStringIO import StringIO
 import time
diff --git a/git/test/objects/test_submodule.py b/git/test/objects/test_submodule.py
index adb4fb82..d6062be9 100644
--- a/git/test/objects/test_submodule.py
+++ b/git/test/objects/test_submodule.py
@@ -40,9 +40,9 @@ class TestSubmodule(TestBase):
 		# at a different time, there is None
 		assert len(Submodule.list_items(rwrepo, self.k_no_subm_tag)) == 0
 		
-		assert sm.path == 'git/ext/gitdb'
+		assert sm.path == 'git/ext/git'
 		assert sm.path != sm.name					# in our case, we have ids there, which don't equal the path
-		assert sm.url == 'git://github.com/gitpython-developers/gitdb.git'
+		assert sm.url == 'git://github.com/gitpython-developers/git.git'
 		assert sm.branch_path == 'refs/heads/master'			# the default ...
 		assert sm.branch_name == 'master'
 		assert sm.parent_commit == rwrepo.head.commit
@@ -384,9 +384,9 @@ class TestSubmodule(TestBase):
 		rm.config_reader()
 		rm.config_writer()
 		
-		# deep traversal gitdb / async
+		# deep traversal git / async
 		rsmsp = [sm.path for sm in rm.traverse()]
-		assert len(rsmsp) == 2			# gitdb and async, async being a child of gitdb
+		assert len(rsmsp) == 2			# git and async, async being a child of git
 		
 		# cannot set the parent commit as root module's path didn't exist
 		self.failUnlessRaises(ValueError, rm.set_parent_commit, 'HEAD')
diff --git a/git/test/performance/test_commit.py b/git/test/performance/test_commit.py
index 80421aa2..561e073f 100644
--- a/git/test/performance/test_commit.py
+++ b/git/test/performance/test_commit.py
@@ -6,7 +6,7 @@
 
 from lib import *
 from git import *
-from gitdb import IStream
+from git import IStream
 from git.test.test_commit import assert_commit_serialization
 from cStringIO import StringIO
 from time import time
diff --git a/git/test/performance/test_pack.py b/git/test/performance/test_pack.py
index da952b17..b1f3abe1 100644
--- a/git/test/performance/test_pack.py
+++ b/git/test/performance/test_pack.py
@@ -7,8 +7,8 @@ from lib import (
 	TestBigRepoR 
 	)
 
-from gitdb.exc import UnsupportedOperation
-from gitdb.db.pack import PackedDB
+from git.exc import UnsupportedOperation
+from git.db.pack import PackedDB
 
 import sys
 import os
diff --git a/git/test/performance/test_pack_streaming.py b/git/test/performance/test_pack_streaming.py
index 795ed1e2..cc890ee0 100644
--- a/git/test/performance/test_pack_streaming.py
+++ b/git/test/performance/test_pack_streaming.py
@@ -7,9 +7,9 @@ from lib import (
 	TestBigRepoR 
 	)
 
-from gitdb.db.pack import PackedDB
-from gitdb.stream import NullStream
-from gitdb.pack import PackEntity
+from git.db.pack import PackedDB
+from git.stream import NullStream
+from git.pack import PackEntity
 
 import os
 import sys
diff --git a/git/test/performance/test_streams.py b/git/test/performance/test_streams.py
index 196e9003..f63d922d 100644
--- a/git/test/performance/test_streams.py
+++ b/git/test/performance/test_streams.py
@@ -1,15 +1,15 @@
 """Performance data streaming performance"""
-from gitdb.db.py import *
-from gitdb.base import *
-from gitdb.stream import *
-from gitdb.util import (
+from git.db.py import *
+from git.base import *
+from git.stream import *
+from git.util import (
 							pool,
 							bin_to_hex
 						)
 
 from git.test.lib import *
-from gitdb import *
-from gitdb.util import bin_to_hex
+from git import *
+from git.util import bin_to_hex
 
 from cStringIO import StringIO
 from time import time
@@ -18,7 +18,7 @@ import sys
 import stat
 import subprocess
 
-from gitdb.test.lib import make_memory_file
+from git.test.lib import make_memory_file
 
 from lib import (
 	TestBigRepoR
@@ -58,7 +58,7 @@ class TestObjDBPerformance(TestBigRepoR):
 	
 	@with_rw_repo('HEAD', bare=True)
 	def test_large_data_streaming(self, rwrepo):
-		# TODO: This part overlaps with the same file in gitdb.test.performance.test_stream
+		# TODO: This part overlaps with the same file in git.test.performance.test_stream
 		# It should be shared if possible
 		ldb = LooseObjectDB(os.path.join(rwrepo.git_dir, 'objects'))
 		
diff --git a/git/test/test_base.py b/git/test/test_base.py
index 408b9833..29916066 100644
--- a/git/test/test_base.py
+++ b/git/test/test_base.py
@@ -12,7 +12,7 @@ from git.test.lib import *
 from git import *
 from itertools import chain
 from git.objects.util import get_object_type_by_name
-from gitdb.util import hex_to_bin
+from git.util import hex_to_bin
 import tempfile
 
 ##################
@@ -22,12 +22,12 @@ from lib import (
 		DeriveTest, 
 	)
 
-from gitdb import *
-from gitdb.util import (
+from git import *
+from git.util import (
 	NULL_BIN_SHA
 	)
 
-from gitdb.typ import (
+from git.typ import (
 	str_blob_type
 	)
 
diff --git a/git/test/test_db.py b/git/test/test_db.py
index db2d7983..5b60644a 100644
--- a/git/test/test_db.py
+++ b/git/test/test_db.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 from git.test.lib import *
 from git.db import *
-from gitdb.util import bin_to_hex
+from git.util import bin_to_hex
 from git.exc import BadObject
 import os
 
diff --git a/git/test/test_example.py b/git/test/test_example.py
index c2e78407..870424e5 100644
--- a/git/test/test_example.py
+++ b/git/test/test_example.py
@@ -4,9 +4,9 @@
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module with examples from the tutorial section of the docs"""
 from lib import *
-from gitdb import IStream
-from gitdb.db.py import PureLooseObjectODB
-from gitdb.util import pool
+from git import IStream
+from git.db.py import PureLooseObjectODB
+from git.util import pool
 		
 from cStringIO import StringIO
 
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index b7991cdb..99569d00 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -9,9 +9,9 @@ from git.index.fun import (
 							aggressive_tree_merge
 							)
 
-from gitdb.util import bin_to_hex
-from gitdb.base import IStream
-from gitdb.typ import str_tree_type
+from git.util import bin_to_hex
+from git.base import IStream
+from git.typ import str_tree_type
 
 from stat import (
 					S_IFDIR, 
diff --git a/git/test/test_pack.py b/git/test/test_pack.py
index 4a7f1caf..c398fc56 100644
--- a/git/test/test_pack.py
+++ b/git/test/test_pack.py
@@ -9,22 +9,22 @@ from lib import (
 					with_packs_rw,
 					fixture_path
 				)
-from gitdb.stream import DeltaApplyReader
+from git.stream import DeltaApplyReader
 
-from gitdb.pack import (
+from git.pack import (
 							PackEntity,
 							PackIndexFile,
 							PackFile
 						)
 
-from gitdb.base import (
+from git.base import (
 							OInfo, 
 							OStream,
 						)
 
-from gitdb.fun import delta_types
-from gitdb.exc import UnsupportedOperation
-from gitdb.util import to_bin_sha
+from git.fun import delta_types
+from git.exc import UnsupportedOperation
+from git.util import to_bin_sha
 from itertools import izip, chain
 from nose import SkipTest
 
diff --git a/git/test/test_refs.py b/git/test/test_refs.py
index 649542f3..722c5ed5 100644
--- a/git/test/test_refs.py
+++ b/git/test/test_refs.py
@@ -4,16 +4,18 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from gitdb.test.lib import *
-from gitdb.ref import *
-import gitdb.ref as ref
+from git.test.lib import *
+from git.ref import *
+import git.ref as ref
 
-from gitdb.util import Actor
-from gitdb.object.tag import TagObject
+from git.util import Actor
+from git.object.tag import TagObject
 
 from itertools import chain
 import os
 
+from nose import SkipTest
+
 class TestRefs(TestBase):
 
 	def test_from_path(self):
@@ -520,3 +522,5 @@ class TestRefs(TestBase):
 	def test_reflog(self):
 		assert isinstance(Head.list_items(self.rorepo).master.log(), RefLog)
 		
+	def test_pure_python_rename(self):
+		raise SkipTest("Pure python reference renames cannot properly handle refnames which become a directory after rename")
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index deadbe9a..9225040f 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -7,7 +7,7 @@ from git.test.lib import *
 from git import *
 from git.util import join_path_native
 from git.exc import BadObject
-from gitdb.util import hex_to_bin, bin_to_hex
+from git.util import hex_to_bin, bin_to_hex
 
 import os, sys
 import tempfile
@@ -589,7 +589,7 @@ class TestRepo(TestBase):
 		assert len(self.rorepo.submodules) == 1		# non-recursive
 		assert len(list(self.rorepo.iter_submodules())) == 2
 		
-		assert isinstance(self.rorepo.submodule("gitdb"), Submodule)
+		assert isinstance(self.rorepo.submodule("git"), Submodule)
 		self.failUnlessRaises(ValueError, self.rorepo.submodule, "doesn't exist")
 		
 	@with_rw_repo('HEAD', bare=False)
diff --git a/git/test/test_stream.py b/git/test/test_stream.py
index b2d4bc14..140dea95 100644
--- a/git/test/test_stream.py
+++ b/git/test/test_stream.py
@@ -12,18 +12,18 @@ from lib import (
 		fixture_path
 	)
 
-from gitdb import *
-from gitdb.util import (
+from git import *
+from git.util import (
 	NULL_HEX_SHA,
 	hex_to_bin
 	)
 
-from gitdb.util import zlib
-from gitdb.typ import (
+from git.util import zlib
+from git.typ import (
 	str_blob_type
 	)
 
-from gitdb.db.py import PureLooseObjectODB
+from git.db.py import PureLooseObjectODB
 import time
 import tempfile
 import os
diff --git a/git/test/test_util.py b/git/test/test_util.py
index 151fe5bc..06dc2941 100644
--- a/git/test/test_util.py
+++ b/git/test/test_util.py
@@ -15,7 +15,7 @@ from git.cmd import dashify
 
 import time
 
-from gitdb.util import (
+from git.util import (
 	to_hex_sha, 
 	to_bin_sha, 
 	NULL_HEX_SHA,