Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Failed to patch #292

Open
lambdalisue opened this issue Aug 19, 2021 · 3 comments
Open

Failed to patch #292

lambdalisue opened this issue Aug 19, 2021 · 3 comments
Labels
bug help wanted

Comments

@lambdalisue
Copy link
Owner

lambdalisue commented Aug 19, 2021 •
edited
Loading

It seems patch fails when there is no common suffix among stage, index, and worktree.

For example

|  HEAD    |  INDEX   | WORKTREE |
|+aaaaaaaa |+aaaaaaaa |          |
|+aaaaaaaa |+aaaaaaaa |          |
|          |+aaaaaaaa |+aaaaaaaa |
|          |+aaaaaaaa |+aaaaaaaa |
|+aaaaaaaa |          |          |
|+aaaaaaaa |          |          |
| XXXXXXXX | XXXXXXXX | XXXXXXXX |

works OK while the last XXXXXXXXXX are common among three but

|  HEAD    |  INDEX   | WORKTREE |
|+aaaaaaaa |+aaaaaaaa |          |
|+aaaaaaaa |+aaaaaaaa |          |
|          |+aaaaaaaa |+aaaaaaaa |
|          |+aaaaaaaa |+aaaaaaaa |
|+aaaaaaaa |          |          |
|+aaaaaaaa |          |          |

does not works while the last line is different among theee.
@lambdalisue
Copy link
Owner Author

Somehow I could not reproduce this issue. I knew there is this issue but could not reproduce it...

@lambdalisue
Copy link
Owner Author

Let me know if someone find a way to reproduce the issue.

@lambdalisue
Copy link
Owner Author

May https://stackoverflow.com/questions/4770177/git-patch-does-not-apply

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
bug help wanted
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@lambdalisue