[bug-patch] [RESEND] another v2.6.1-165-gc43eeb2 regression

[Dmitry V. Levin]

Hi,

Starting with commit v2.6.1-165-gc43eeb2 and up to current HEAD
(v2.6.1-176-g386ae15), a certain kind of patch files is no longer
processed properly.  Here is a sample.

$ patch -p1 << '__EOF__'
From: Your Name <address@hidden>
Date: Wed, 24 Apr 2012 12:34:56 +0000
Subject: [PATCH 1/2] 1

---
 target |    1 +
 1 file changed, 1 insertion(+)
 create mode 100644 target

diff --git a/target b/target
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/target
@@ -0,0 +1 @@
+1

From: Your Name <address@hidden>
Date: Wed, 24 Apr 2012 12:34:56 +0000
Subject: [PATCH 2/2] 2

---
 target |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target b/target
index d00491f..0cfbf08 100644
--- a/target
+++ b/target
@@ -1 +1 @@
-1
+2
__EOF__
patching file target
can't find file to patch at input line 30
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|From: Your Name <address@hidden>
|Date: Wed, 24 Apr 2012 12:34:56 +0000
|Subject: [PATCH 2/2] 2
|
|---
| target |    2 +-
| 1 file changed, 1 insertion(+), 1 deletion(-)
|
|diff --git a/target b/target
|index d00491f..0cfbf08 100644
|--- a/target
|+++ b/target
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
$ cat target 
1

The bug was originally reported via https://bugzilla.altlinux.org/27359
by Konstantin Pavlov.


-- 
ldv

pgpdEINbnEniT.pgp
Description: PGP signature