natalie
/
indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle partial incomplete and line-ending munging diffs (resolves issue 633).

release-1.1
Thomas Keller 2011-03-18 00:55:02 +01:00
parent be7725694e
commit a3dd1c45f3
6 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
test/data/IDF_DiffTest/test-15-git-change-single-line.diff → test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.diff
View File

0
test/data/IDF_DiffTest/test-15-git-change-single-line.expected → test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.expected
View File

8
test/data/IDF_DiffTest/test-16-git-newline-removed.diff 100644
View File

@ -0,0 +1,8 @@
diff --git a/foo b/foo
index a86c18f..71ccdd0 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-This is foo
+This is foo
\ No newline at end of file

1
test/data/IDF_DiffTest/test-16-git-newline-removed.expected 100644
View File

@ -0,0 +1 @@
a:1:{s:3:"foo";a:2:{s:6:"chunks";a:1:{i:0;a:2:{i:0;a:3:{i:0;s:1:"1";i:1;s:0:"";i:2;s:11:"This is foo";}i:1;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:11:"This is foo";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"1";i:1;i:1;}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}

8
test/data/IDF_DiffTest/test-17-git-newline-added.diff 100644
View File

@ -0,0 +1,8 @@
diff --git a/foo b/foo
index 71ccdd0..a86c18f 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-This is foo
\ No newline at end of file
+This is foo

1
test/data/IDF_DiffTest/test-17-git-newline-added.expected 100644
View File

@ -0,0 +1 @@
a:1:{s:3:"foo";a:2:{s:6:"chunks";a:1:{i:0;a:2:{i:0;a:3:{i:0;s:1:"1";i:1;s:0:"";i:2;s:11:"This is foo";}i:1;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:11:"This is foo";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"1";i:1;i:1;}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}