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

Fix diff command to only set --strip-trailing-cr if available #152

Merged
merged 2 commits into from
Aug 13, 2024

Conversation

thbeu
Copy link
Contributor

@thbeu thbeu commented Aug 13, 2024

As reported by #111 (comment).

@landryb
Copy link

landryb commented Aug 13, 2024

thanks ! fwiw there are other occurences in test1/2/3.. i'll do another PR on top to change the shebang to plain sh, there's no need for bash here

@thbeu
Copy link
Contributor Author

thbeu commented Aug 13, 2024

i'll do another PR on top to change the shebang to plain sh, there's no need for bash here

Have a look at #150 first.

@thbeu thbeu changed the title Fix diff command to only set --strip-trailing-cr on Win Fix diff command to only set --strip-trailing-cr if available Aug 13, 2024
@rouault rouault merged commit bcd39fc into OSGeo:master Aug 13, 2024
12 checks passed
@thbeu thbeu deleted the fix-diff-command branch August 13, 2024 18:17
@landryb
Copy link

landryb commented Aug 19, 2024

thanks, with #150 & #152, all tests for 1.6.1 pass fine on OpenBSD

100% tests passed, 0 tests failed out of 7

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.

3 participants