combinediff is setting incorrect paths to files

[Roo4L]

Hi! I've face a bug during execution of combinediff. Let's say I have following first and second patch files: first.patch

--- a/file.c
+++ b/file.c
@@ -0,0 +1,3 @@
+a
+b
+c

second.patch

--- a/file.c
+++ b/file.c
@@ -1,3 +1,2 @@
 a
 b
-c

After executing combinediff -p1 first.patch second.patch I get the following output:

diff -u b/file.c b/file.c
--- b/file.c
+++ b/file.c
@@ -0,0 +1,2 @@
+a
+b

As you see, the path to the first file is b instead of a. I understand that it doesn't affect patch applying, but it breaks the convention used by almost all package vendors. Hope you would have a chance to fix it. Thanks in advance!

[samatcodeapprove]

I have seen this as well!

[samatcodeapprove]

@Roo4L I think have a fix here: https://github.com/twaugh/patchutils/pull/56

[sergiomb2]

Cool , I will try test it this weekend , and give some feedback

[malhal]

what command did you use to make those patch files? My diff has different output.