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

config.c: fix regression for core.safecrlf false #1767

Merged
merged 1 commit into from
Jul 30, 2018

Conversation

dscho
Copy link
Member

@dscho dscho commented Jul 26, 2018

A regression introduced in 8462ff4 ("convert_to_git(): safe_crlf/checksafe becomes int conv_flags", 2018-01-13) back in Git 2.17 cycle caused autocrlf rewrites to produce a warning message despite setting safecrlf=false.

This should fix #1242

/cc @tboegi

A regression introduced in 8462ff4 ("convert_to_git():
safe_crlf/checksafe becomes int conv_flags", 2018-01-13) back in Git
2.17 cycle caused autocrlf rewrites to produce a warning message
despite setting safecrlf=false.

Signed-off-by: Anthony Sottile <asottile@umich.edu>
Acked-By: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
@tboegi
Copy link

tboegi commented Jul 26, 2018

Thanks for cleaning up my mess

@dscho
Copy link
Member Author

dscho commented Jul 27, 2018

Thanks for cleaning up my mess

@tboegi I take that as a 👍 ?

@tboegi
Copy link

tboegi commented Jul 27, 2018

Yes, sorry being unclear here - please go ahead and merge

@dscho dscho merged commit 07e862c into git-for-windows:master Jul 30, 2018
@dscho
Copy link
Member Author

dscho commented Jul 30, 2018

@tboegi thanks!

For future record, I really would like to establish the rule that a reviewer merges PRs in Git for Windows (unless the most appropriate reviewer only has a grayed-out Merge button).

@gitster gitster deleted the as/safecrlf-quiet-fix branch November 6, 2018 06:00
@gitster gitster restored the as/safecrlf-quiet-fix branch November 6, 2018 06:20
@gitster gitster deleted the as/safecrlf-quiet-fix branch August 16, 2019 20:18
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.

"warning: LF will be replaced by CRLF in myFile" when using core.autocrlf?
3 participants