summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Copeland <rcopeland@geek.net>2010-05-07 15:18:19 -0400
committerSebastian Thiel <byronimo@gmail.com>2010-05-10 22:16:10 +0200
commitde5bc8f7076c5736ef1efa57345564fbc563bd19 (patch)
treefa7df33ffa4399fbf6b79b35916b2acafe3903e7
parentc083f3d0b853e723d0d4b00ff2f1ec5f65f05cba (diff)
downloadgitpython-de5bc8f7076c5736ef1efa57345564fbc563bd19.tar.gz
Handle filenames with embedded spaces when generating diffs
-rw-r--r--lib/git/diff.py2
-rw-r--r--test/git/test_refs.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/git/diff.py b/lib/git/diff.py
index c7c54bdf..0dd4ed6e 100644
--- a/lib/git/diff.py
+++ b/lib/git/diff.py
@@ -342,7 +342,7 @@ class Diff(object):
if not line.startswith(":"):
continue
# END its not a valid diff line
- old_mode, new_mode, a_blob_id, b_blob_id, change_type, path = line[1:].split()
+ old_mode, new_mode, a_blob_id, b_blob_id, change_type, path = line[1:].split(None, 5)
a_path = path
b_path = path
deleted_file = False
diff --git a/test/git/test_refs.py b/test/git/test_refs.py
index 58a51f4a..7c487bd0 100644
--- a/test/git/test_refs.py
+++ b/test/git/test_refs.py
@@ -37,6 +37,7 @@ class TestRefs(TestBase):
assert tagobj.tag == tag.name
assert isinstance( tagobj.tagger, Actor )
assert isinstance( tagobj.tagged_date, int )
+ assert isinstance( tagobj.tagger_tz_offset, int )
assert tagobj.message
# END if we have a tag object
# END for tag in repo-tags