diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-23 13:49:05 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-23 13:49:05 +0200 |
| commit | aea0243840a46021e6f77c759c960a06151d91c9 (patch) | |
| tree | 54009e17043813dbab91df474e78b364be0e8f4c /lib/git/repo.py | |
| parent | c0ef65b43688b1a4615a1e7332f6215f9a8abb19 (diff) | |
| download | gitpython-aea0243840a46021e6f77c759c960a06151d91c9.tar.gz | |
Added test for aggressive_tree_merge
Diffstat (limited to 'lib/git/repo.py')
| -rw-r--r-- | lib/git/repo.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/repo.py b/lib/git/repo.py index f97126ea..79275106 100644 --- a/lib/git/repo.py +++ b/lib/git/repo.py @@ -742,7 +742,7 @@ class Repo(object): # we at least give a proper error instead of letting git fail prev_cwd = None prev_path = None - odbt = kwargs.pop('odbt', GitCmdObjectDB) + odbt = kwargs.pop('odbt', type(self.odb)) if os.name == 'nt': if '~' in path: raise OSError("Git cannot handle the ~ character in path %r correctly" % path) |