Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

combinediff is setting incorrect paths to files #53

Open
Roo4L opened this issue Jul 7, 2022 · 4 comments · May be fixed by samatcodeapprove/patchutils#1 or #56
Open

combinediff is setting incorrect paths to files #53

Roo4L opened this issue Jul 7, 2022 · 4 comments · May be fixed by samatcodeapprove/patchutils#1 or #56

Comments

@Roo4L
Copy link

Roo4L commented Jul 7, 2022

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
Copy link

I have seen this as well!

@samatcodeapprove
Copy link

@Roo4L I think have a fix here:
#56

@sergiomb2
Copy link
Contributor

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

@malhal
Copy link

malhal commented May 23, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants