aboutsummaryrefslogtreecommitdiff
path: root/git/test/fixtures
diff options
context:
space:
mode:
authorVincent Driessen <me@nvie.com>2016-04-19 21:46:59 +0200
committerVincent Driessen <me@nvie.com>2016-04-19 21:46:59 +0200
commit8bbf1a3b801fb4e00c10f631faa87114dcd0462f (patch)
treea231962fc64fb5b255d87ecb409bfc1f48dfe8a5 /git/test/fixtures
parent0d7a40f603412be7e1046b500057b08558d9d250 (diff)
parent1445b59bb41c4b1a94b7cb0ec6864c98de63814b (diff)
downloadGitPython-8bbf1a3b801fb4e00c10f631faa87114dcd0462f.tar.gz
GitPython-8bbf1a3b801fb4e00c10f631faa87114dcd0462f.zip
Merge pull request #412 from nvie/fix-diff-patch-parsing
Fix diff patch parsing
Diffstat (limited to 'git/test/fixtures')
-rw-r--r--git/test/fixtures/diff_file_with_spaces7
-rw-r--r--git/test/fixtures/diff_initial2
2 files changed, 7 insertions, 2 deletions
diff --git a/git/test/fixtures/diff_file_with_spaces b/git/test/fixtures/diff_file_with_spaces
new file mode 100644
index 00000000..a9f0b06c
--- /dev/null
+++ b/git/test/fixtures/diff_file_with_spaces
@@ -0,0 +1,7 @@
+diff --git a/file with spaces b/file with spaces
+new file mode 100644
+index 0000000000000000000000000000000000000000..75c620d7b0d3b0100415421a97f553c979d75174
+--- /dev/null
++++ b/file with spaces
+@@ -0,0 +1 @@
++ohai
diff --git a/git/test/fixtures/diff_initial b/git/test/fixtures/diff_initial
index 6037c677..648d7043 100644
--- a/git/test/fixtures/diff_initial
+++ b/git/test/fixtures/diff_initial
@@ -1,5 +1,3 @@
---- /dev/null
-+++ b/CHANGES
@@ -0,0 +1,7 @@
+=======
+CHANGES