summaryrefslogtreecommitdiff
path: root/git/diff.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-03-16 19:29:15 +0100
committerSebastian Thiel <byronimo@gmail.com>2016-03-16 19:29:15 +0100
commitc877794b51f43b5fb2338bda478228883288bcdd (patch)
tree1387978ccf7637eb7a9a2ada62bec1b8a1a62b59 /git/diff.py
parentb2971489fec32160836519e66ca6b97987c33d0c (diff)
parente328ffddec722be3fba2c9b637378e31e623d58e (diff)
downloadgitpython-c877794b51f43b5fb2338bda478228883288bcdd.tar.gz
Merge pull request #398 from gitprime/master
Split diff line by '\t' for metadata and path
Diffstat (limited to 'git/diff.py')
-rw-r--r--git/diff.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git/diff.py b/git/diff.py
index 9059091e..062220df 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -365,7 +365,8 @@ 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(None, 5)
+ meta, _, path = line[1:].partition('\t')
+ old_mode, new_mode, a_blob_id, b_blob_id, change_type = meta.split(None, 4)
path = path.strip()
a_path = path
b_path = path