Fix reporting wrong path when file is renamed - #913
Merged
marcospb19 merged 10 commits intoFeb 15, 2026
Conversation
When solving a conflict the user might ask Ouch to rename the file (add a number suffix to avoid the conflict) In that scenario, Ouch used to report the wrong path, as if it was not renamed This commit also changes the logs in an attempt to be more precise about what was decompressed
marcospb19
force-pushed
the
fix-ouch-reporting-wrong-path-when-decompressing
branch
from
February 15, 2026 22:50
8a24432 to
c688102
Compare
marcospb19
marked this pull request as draft
February 15, 2026 22:58
marcospb19
force-pushed
the
fix-ouch-reporting-wrong-path-when-decompressing
branch
from
February 15, 2026 23:03
c688102 to
cd1812a
Compare
marcospb19
marked this pull request as ready for review
February 15, 2026 23:05
marcospb19
force-pushed
the
fix-ouch-reporting-wrong-path-when-decompressing
branch
from
February 15, 2026 23:25
c3338f5 to
bb6e33f
Compare
marcospb19
deleted the
fix-ouch-reporting-wrong-path-when-decompressing
branch
February 15, 2026 23:53
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When solving a conflict the user might ask Ouch to rename the file (add a number suffix to avoid the conflict)
In that scenario, Ouch used to report the wrong path, as if it was not renamed
This commit also changes the logs in an attempt to be more precise about what was decompressed