rebase

Author: LeResKP

git/diff.py

@@ -474,12 +474,13 @@ def handle_diff_line(line):
                 return
 
             meta, _, path = line[1:].partition('\t')
-            old_mode, new_mode, a_blob_id, b_blob_id, change_type = meta.split(None, 4)
+            old_mode, new_mode, a_blob_id, b_blob_id, _change_type = meta.split(None, 4)
             # Change type can be R100
             # R: status letter
             # 100: score (in case of copy and rename)
-            change_type = change_type[0]
-            score = ''.join(change_type[1:]) or None
+            change_type = _change_type[0]
+            score_str = ''.join(_change_type[1:])
+            score = int(score_str) if score_str.isdigit() else None
             path = path.strip()
             a_path = path.encode(defenc)
             b_path = path.encode(defenc)

git/test/test_diff.py

@@ -109,6 +109,7 @@ def test_diff_with_rename(self):
         self.assertEqual(diff.rename_from, 'this')
         self.assertEqual(diff.rename_to, 'that')
         self.assertEqual(diff.change_type, 'R')
+        self.assertEqual(diff.score, 100)
         self.assertEqual(len(list(diffs.iter_change_type('R'))), 1)
 
     def test_diff_with_change_in_type(self):