diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-04 17:30:31 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-04 17:30:31 +0200 |
| commit | 6fbb69306c0e14bacb8dcb92a89af27d3d5d631f (patch) | |
| tree | 4a6e0c14b412315c13cc4ac6466f4888644195a3 /lib/git/index.py | |
| parent | 25dca42bac17d511b7e2ebdd9d1d679e7626db5f (diff) | |
| parent | e746f96bcc29238b79118123028ca170adc4ff0f (diff) | |
| download | gitpython-6fbb69306c0e14bacb8dcb92a89af27d3d5d631f.tar.gz | |
Merge branch 'odb'
Conflicts:
lib/git/cmd.py
Diffstat (limited to 'lib/git/index.py')
| -rw-r--r-- | lib/git/index.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/index.py b/lib/git/index.py index 8ccc3fe3..36428315 100644 --- a/lib/git/index.py +++ b/lib/git/index.py @@ -21,7 +21,7 @@ import git.diff as diff from errors import GitCommandError from git.objects import Blob, Tree, Object, Commit -from git.utils import SHA1Writer, LazyMixin, ConcurrentWriteOperation, join_path_native +from git.utils import IndexFileSHA1Writer, LazyMixin, ConcurrentWriteOperation, join_path_native class CheckoutError( Exception ): @@ -461,7 +461,7 @@ class IndexFile(LazyMixin, diff.Diffable): write_op = ConcurrentWriteOperation(file_path or self._file_path) stream = write_op._begin_writing() - stream = SHA1Writer(stream) + stream = IndexFileSHA1Writer(stream) # header stream.write("DIRC") |