From 71b3845807458766cd715c60a5f244836f4273b6 Mon Sep 17 00:00:00 2001
From: JJ Graham <thetwoj@gmail.com>
Date: Thu, 17 Oct 2019 23:04:22 -0500
Subject: Fixed new test for copied files

---
 git/diff.py                            | 6 ++++--
 git/test/fixtures/diff_copied_mode_raw | 2 +-
 git/test/test_diff.py                  | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'git')

diff --git a/git/diff.py b/git/diff.py
index 5a63d44c..8bb0f839 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -167,7 +167,7 @@ class DiffIndex(list):
     # R = Renamed
     # M = Modified
     # T = Changed in the type
-    change_type = ("A", "D", "R", "M", "T")
+    change_type = ("A", "C", "D", "R", "M", "T")
 
     def iter_change_type(self, change_type):
         """
@@ -245,7 +245,9 @@ class Diff(object):
                                    ^rename[ ]to[ ](?P<rename_to>.*)(?:\n|$))?
                                 (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
                                 (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
-                                (?:^copied[ ]file[ ]mode[ ](?P<copied_file_mode>.+)(?:\n|$))?
+                                (?:^similarity[ ]index[ ]\d+%\n
+                                   ^copy[ ]from[ ].*\n
+                                   ^copy[ ]to[ ](?P<copied_file_mode>.*)(?:\n|$))?
                                 (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
                                     \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
                                 (?:^---[ ](?P<a_path>[^\t\n\r\f\v]*)[\t\r\f\v]*(?:\n|$))?
diff --git a/git/test/fixtures/diff_copied_mode_raw b/git/test/fixtures/diff_copied_mode_raw
index 7f414d81..7640f3ab 100644
--- a/git/test/fixtures/diff_copied_mode_raw
+++ b/git/test/fixtures/diff_copied_mode_raw
@@ -1 +1 @@
-:100644 100644 cfe9dea cfe9dea C100     test1.txt       test2.txt
+:100644 100644 cfe9deac6e10683917e80f877566b58644aa21df cfe9deac6e10683917e80f877566b58644aa21df C100	test1.txt	test2.txt
diff --git a/git/test/test_diff.py b/git/test/test_diff.py
index 079f8bea..4d71443f 100644
--- a/git/test/test_diff.py
+++ b/git/test/test_diff.py
@@ -120,7 +120,6 @@ class TestDiff(TestBase):
         assert_equal(1, len(diffs))
 
         diff = diffs[0]
-        print(diff)
         assert_true(diff.copied_file)
         assert isinstance(str(diff), str)
 
-- 
cgit v1.2.1