From a3dd1c45f36cd0aa7674e265ba500ae96582a1a7 Mon Sep 17 00:00:00 2001
From: Thomas Keller <me@thomaskeller.biz>
Date: Fri, 18 Mar 2011 00:55:02 +0100
Subject: [PATCH] Handle partial incomplete and line-ending munging diffs
 (resolves issue 633).

---
 ...e.diff => test-15-git-change-single-line-invalid.diff} | 0
 ...ed => test-15-git-change-single-line-invalid.expected} | 0
 test/data/IDF_DiffTest/test-16-git-newline-removed.diff   | 8 ++++++++
 .../IDF_DiffTest/test-16-git-newline-removed.expected     | 1 +
 test/data/IDF_DiffTest/test-17-git-newline-added.diff     | 8 ++++++++
 test/data/IDF_DiffTest/test-17-git-newline-added.expected | 1 +
 6 files changed, 18 insertions(+)
 rename test/data/IDF_DiffTest/{test-15-git-change-single-line.diff => test-15-git-change-single-line-invalid.diff} (100%)
 rename test/data/IDF_DiffTest/{test-15-git-change-single-line.expected => test-15-git-change-single-line-invalid.expected} (100%)
 create mode 100644 test/data/IDF_DiffTest/test-16-git-newline-removed.diff
 create mode 100644 test/data/IDF_DiffTest/test-16-git-newline-removed.expected
 create mode 100644 test/data/IDF_DiffTest/test-17-git-newline-added.diff
 create mode 100644 test/data/IDF_DiffTest/test-17-git-newline-added.expected

diff --git a/test/data/IDF_DiffTest/test-15-git-change-single-line.diff b/test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.diff
similarity index 100%
rename from test/data/IDF_DiffTest/test-15-git-change-single-line.diff
rename to test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.diff
diff --git a/test/data/IDF_DiffTest/test-15-git-change-single-line.expected b/test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.expected
similarity index 100%
rename from test/data/IDF_DiffTest/test-15-git-change-single-line.expected
rename to test/data/IDF_DiffTest/test-15-git-change-single-line-invalid.expected
diff --git a/test/data/IDF_DiffTest/test-16-git-newline-removed.diff b/test/data/IDF_DiffTest/test-16-git-newline-removed.diff
new file mode 100644
index 0000000..45302b2
--- /dev/null
+++ b/test/data/IDF_DiffTest/test-16-git-newline-removed.diff
@@ -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
diff --git a/test/data/IDF_DiffTest/test-16-git-newline-removed.expected b/test/data/IDF_DiffTest/test-16-git-newline-removed.expected
new file mode 100644
index 0000000..7fd1428
--- /dev/null
+++ b/test/data/IDF_DiffTest/test-16-git-newline-removed.expected
@@ -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;}}}}}
\ No newline at end of file
diff --git a/test/data/IDF_DiffTest/test-17-git-newline-added.diff b/test/data/IDF_DiffTest/test-17-git-newline-added.diff
new file mode 100644
index 0000000..5e0c3ff
--- /dev/null
+++ b/test/data/IDF_DiffTest/test-17-git-newline-added.diff
@@ -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
diff --git a/test/data/IDF_DiffTest/test-17-git-newline-added.expected b/test/data/IDF_DiffTest/test-17-git-newline-added.expected
new file mode 100644
index 0000000..7fd1428
--- /dev/null
+++ b/test/data/IDF_DiffTest/test-17-git-newline-added.expected
@@ -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;}}}}}
\ No newline at end of file