Skip to content

Improve ldiff binary support#105

Merged
halostatue merged 2 commits intohalostatue:mainfrom
criteo-forks:improve_ldiff_binary_support
Feb 2, 2025
Merged

Improve ldiff binary support#105
halostatue merged 2 commits intohalostatue:mainfrom
criteo-forks:improve_ldiff_binary_support

Conversation

@Annih
Copy link
Contributor

@Annih Annih commented Jan 28, 2025

Before this change, the comparison was reversed and diff were not detected. (See #102)

This commit also change the output when a diff is detected to look like the GNU diff output.

Also fix the support of all other format than :report, by quickly halting the diff process if there is a binary diff.

@halostatue
Copy link
Owner

@Annih This will need to be rebased to be merged.

auto-merge was automatically disabled February 2, 2025 18:35

Head branch was pushed to by a user without write access

@Annih Annih force-pushed the improve_ldiff_binary_support branch from 28de1fb to b098fc8 Compare February 2, 2025 18:35
Before this change, the comparison was reversed and diff were not
detected.

This commit also change the output when a diff is detected to look
like the GNU diff output.

Also fix the support of all other format than :report, by quickly
halting the diff process if there is a binary diff.
@Annih Annih force-pushed the improve_ldiff_binary_support branch from b098fc8 to 6f7313e Compare February 2, 2025 18:54
@Annih
Copy link
Contributor Author

Annih commented Feb 2, 2025

I noticed my rebase of #104 in #103 was incorrect as it was still using @binary here and there :(
Also the patch I previously uploaded for this PR was not incomplete; it should be good now :)

@halostatue halostatue merged commit f40a910 into halostatue:main Feb 2, 2025
63 checks passed
@Annih Annih deleted the improve_ldiff_binary_support branch February 12, 2025 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ldiff does not behave well with binary files ldiff does not behave well with empty files

2 participants