From cb810c48c036f50c19b08df7e161cdb0550a2abd Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 22 Nov 2016 00:19:51 +0200 Subject: patch: fix matching failure Fix matching failure when plist is advanced while checking for buffered lines - the lines in the hunk that are about to be added should be skipped when checking for matching context. Also add a valid test case that fails with current busybox and is fixed by the change. Signed-off-by: Aaro Koskinen Signed-off-by: Denys Vlasenko --- testsuite/patch.tests | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'testsuite/patch.tests') diff --git a/testsuite/patch.tests b/testsuite/patch.tests index 2759d2ad4..39205242c 100755 --- a/testsuite/patch.tests +++ b/testsuite/patch.tests @@ -242,6 +242,51 @@ patch: can't open 'dir2///file': No such file or directory zxc " +testing "patch internal buffering bug?" \ + 'patch -p1 2>&1; echo $?; cat input' \ +"\ +patching file input +0 +foo + + + + + + +1 +2 +3 + +bar +" \ +"\ +foo + + + + + + + +bar +" \ +"\ +--- a/input.orig ++++ b/input +@@ -5,5 +5,8 @@ foo + + + ++1 ++2 ++3 + + bar +-- +2.9.2 +" \ + rm input.orig 2>/dev/null exit $FAILCOUNT -- cgit v1.2.3