summaryrefslogtreecommitdiff
path: root/git/test
diff options
context:
space:
mode:
authorVincent Driessen <me@nvie.com>2016-05-30 15:26:23 +0200
committerVincent Driessen <me@nvie.com>2016-05-30 15:44:46 +0200
commit1faf84f8eb760b003ad2be81432443bf443b82e6 (patch)
treee3bde34d58698fb4ae3c2bf1e45830dccd8e724e /git/test
parente836e5cdcc7e3148c388fe8c4a1bab7eeb00cc3f (diff)
downloadgitpython-fix-octal-escaped-path-parser-bug.tar.gz
Fix bug in diff parser outputfix-octal-escaped-path-parser-bug
The diff --patch parser was missing some edge case where Git would encode non-ASCII chars in path names as octals, but these weren't decoded properly. \360\237\222\251.txt Decoded via utf-8, that will return: 💩.txt
Diffstat (limited to 'git/test')
-rw-r--r--git/test/fixtures/diff_patch_unsafe_paths7
-rw-r--r--git/test/test_diff.py13
2 files changed, 14 insertions, 6 deletions
diff --git a/git/test/fixtures/diff_patch_unsafe_paths b/git/test/fixtures/diff_patch_unsafe_paths
index 14375f79..9ee6b834 100644
--- a/git/test/fixtures/diff_patch_unsafe_paths
+++ b/git/test/fixtures/diff_patch_unsafe_paths
@@ -61,6 +61,13 @@ index 0000000000000000000000000000000000000000..eaf5f7510320b6a327fb308379de2f94
+++ "b/path/¯\\_(ツ)_|¯"
@@ -0,0 +1 @@
+dummy content
+diff --git "a/path/\360\237\222\251.txt" "b/path/\360\237\222\251.txt"
+new file mode 100644
+index 0000000000000000000000000000000000000000..eaf5f7510320b6a327fb308379de2f94d8859a54
+--- /dev/null
++++ "b/path/\360\237\222\251.txt"
+@@ -0,0 +1 @@
++dummy content
diff --git a/a/with spaces b/b/with some spaces
similarity index 100%
rename from a/with spaces
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