Merge pull request twaugh#5 from jpoimboe/interdiff-eof

Don't trim pre-context for patches at end of file

Author: twaugh

.gitignore

@@ -28,23 +28,28 @@ src/rediff
 
 # These are generated from *.in files
 /patchutils.spec
-/dehtmldiff
-/editdiff
-/espdiff
-/fixcvsdiff
-/recountdiff
-/splitdiff
-/unwrapdiff
+/scripts/dehtmldiff
+/scripts/editdiff
+/scripts/espdiff
+/scripts/fixcvsdiff
+/scripts/recountdiff
+/scripts/splitdiff
+/scripts/unwrapdiff
 
 # These are generated from the XML file.
 doc/*.1
 
-# Test arena
+# Tests
 /test-arena
+/test-driver
+/test-suite.log
+/tests/*/run-test.log
+/tests/*/run-test.trs
 
 # Backup files
 *.bak
 *~
+*.swp
 
 # Tarballs
 patchutils-*.tar.?z*

Makefile.am

@@ -222,9 +222,7 @@ TESTS = tests/newline1/run-test \
 # Feel free to send me patches. :-)
 XFAIL_TESTS = \
 	tests/delhunk5/run-test \
-	tests/delhunk6/run-test \
-	tests/trimlast1/run-test \
-	tests/trimlast2/run-test
+	tests/delhunk6/run-test
 
 distclean-local:
 	-rm -rf $(top_builddir)/test-arena

src/interdiff.c

@@ -933,7 +933,7 @@ trim_context (FILE *f /* positioned at start of @@ line */,
 
 		pre -= strip_pre;
 		post -= strip_post;
-		if (pre > post)
+		if (post && pre > post)
 			strip_pre += pre - post;
 		orig_offset += strip_pre;
 		new_orig_count -= strip_pre + strip_post;

tests/flip2/run-test

@@ -33,7 +33,8 @@ sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
 cmp - patch-cmp << EOF || exit 1
 --- file.orig
 +++ file
-@@ -2,2 +2,2 @@
+@@ -1,3 +1,3 @@
+ a
 -b
  c
 +d

tests/flip4/run-test

@@ -57,7 +57,10 @@ sed -e "s/$(/bin/echo -ne '\t').*$//" patch-flipped > patch-cmp
 cmp - patch-cmp << EOF || exit 1
 --- file.orig
 +++ file
-@@ -12 +11,0 @@
+@@ -9,4 +9,3 @@
+ i
+ j
+ k
 -l
 
 === 8< === cut here === 8< ===

tests/trimlast1/run-test

@@ -41,6 +41,7 @@ ${INTERDIFF} patch1 patch2 > patch1-2 2>errors || exit 1
 [ -s errors ] && exit 1
 
 cat << EOF | cmp - patch1-2 || exit 1
+diff -u file file
 --- file
 +++ file
 @@ -6,3 +6,4 @@

tests/trimlast2/run-test

@@ -35,6 +35,7 @@ ${COMBINEDIFF} patch1 patch2 > patch12 2>errors || exit 1
 [ -s errors ] && exit 1
 
 cat << EOF | cmp - patch12 || exit 1
+diff -u file file
 --- file
 +++ file
 @@ -1,4 +1,4 @@