Skip to content

combinediff is setting incorrect paths to files #53

Closed
samatcodeapprove/patchutils
#1

Description

@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!

Activity

  1. samatcodeapprove commented on Feb 1, 2023

    @samatcodeapprove

    I have seen this as well!

  2. added a commit that references this issue on Feb 2, 2023
  3. samatcodeapprove commented on Feb 2, 2023

    @samatcodeapprove

    @Roo4L I think have a fix here:
    #56

  4. sergiomb2 commented on Feb 2, 2023

    @sergiomb2
    Contributor

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

  5. malhal commented on May 23, 2024

    @malhal

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

  6. added 2 commits that reference this issue on Aug 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions