summaryrefslogtreecommitdiff
path: root/git/test/test_diff.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-30 18:53:23 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-30 18:53:23 +0200
commitf5089d9d6c303b47936a741b7bdf37293ec3a1c6 (patch)
tree932a165ad2968a2c0dba7853c60b6da5e7e30ab9 /git/test/test_diff.py
parenta3f24f64a20d1e09917288f67fd21969f4444acd (diff)
parent1faf84f8eb760b003ad2be81432443bf443b82e6 (diff)
downloadgitpython-f5089d9d6c303b47936a741b7bdf37293ec3a1c6.tar.gz
Merge pull request #454 from gitpython-developers/fix-octal-escaped-path-parser-bug
Fix bug in diff parser output
Diffstat (limited to 'git/test/test_diff.py')
-rw-r--r--git/test/test_diff.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/git/test/test_diff.py b/git/test/test_diff.py
index 1d7a4fda..8966351a 100644
--- a/git/test/test_diff.py
+++ b/git/test/test_diff.py
@@ -161,16 +161,17 @@ class TestDiff(TestBase):
self.assertEqual(res[6].b_path, u'path/with spaces')
self.assertEqual(res[7].b_path, u'path/with-question-mark?')
self.assertEqual(res[8].b_path, u'path/¯\\_(ツ)_|¯')
+ self.assertEqual(res[9].b_path, u'path/💩.txt')
# The "Moves"
# NOTE: The path prefixes a/ and b/ here are legit! We're actually
# verifying that it's not "a/a/" that shows up, see the fixture data.
- self.assertEqual(res[9].a_path, u'a/with spaces') # NOTE: path a/ here legit!
- self.assertEqual(res[9].b_path, u'b/with some spaces') # NOTE: path b/ here legit!
- self.assertEqual(res[10].a_path, u'a/ending in a space ')
- self.assertEqual(res[10].b_path, u'b/ending with space ')
- self.assertEqual(res[11].a_path, u'a/"with-quotes"')
- self.assertEqual(res[11].b_path, u'b/"with even more quotes"')
+ self.assertEqual(res[10].a_path, u'a/with spaces') # NOTE: path a/ here legit!
+ self.assertEqual(res[10].b_path, u'b/with some spaces') # NOTE: path b/ here legit!
+ self.assertEqual(res[11].a_path, u'a/ending in a space ')
+ self.assertEqual(res[11].b_path, u'b/ending with space ')
+ self.assertEqual(res[12].a_path, u'a/"with-quotes"')
+ self.assertEqual(res[12].b_path, u'b/"with even more quotes"')
def test_diff_patch_format(self):
# test all of the 'old' format diffs for completness - it should at least