aboutsummaryrefslogtreecommitdiff
path: root/git/test/fixtures
diff options
context:
space:
mode:
authorBarry Scott <barry@barrys-emacs.org>2016-06-06 09:27:20 +0100
committerBarry Scott <barry@barrys-emacs.org>2016-06-06 09:27:20 +0100
commit35658887753da7da9a32a297346fd4ee6e53d45c (patch)
tree64e857e2ea087d489369937e42ea7374d7e04e84 /git/test/fixtures
parent08a0fad2c9dcdfe0bbc980b8cd260b4be5582381 (diff)
parente0b21f454ea43a5f67bc4905c641d95f8b6d96fd (diff)
downloadGitPython-35658887753da7da9a32a297346fd4ee6e53d45c.tar.gz
GitPython-35658887753da7da9a32a297346fd4ee6e53d45c.zip
Merge remote-tracking branch 'upstream/master' into pr-cmd-raise-with-stderr-on-error
Diffstat (limited to 'git/test/fixtures')
-rw-r--r--git/test/fixtures/commit_invalid_data6
-rw-r--r--git/test/fixtures/diff_patch_unsafe_paths7
2 files changed, 13 insertions, 0 deletions
diff --git a/git/test/fixtures/commit_invalid_data b/git/test/fixtures/commit_invalid_data
new file mode 100644
index 00000000..d112bf2d
--- /dev/null
+++ b/git/test/fixtures/commit_invalid_data
@@ -0,0 +1,6 @@
+tree 9f1a495d7d9692d24f5caedaa89f5c2c32d59368
+parent 492ace2ffce0e426ebeb55e364e987bcf024dd3b
+author E.Azer KoĆoĆoĆoculu <azer@kodfabrik.com> 1306710073 +0300
+committer E.Azer KoĆoĆoĆoculu <azer@kodfabrik.com> 1306710073 +0300
+
+add environjs
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