-
Notifications
You must be signed in to change notification settings - Fork 723
Normalize line endings on checkout/tfs push if autocrlf=true #1210
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
Conversation
Having been bitten by autocrlf multiple times, I am not so sure why this change is needed. After your change, files which have LF (UNIX style line endings) by intention in TFS are now put back into If you still want to proceed with your idea, you should at least update the documentation to mention |
I agree that the default doesn't need to be changed, I can revert those changes. The main issue is that git-tfs uses /// <summary>
/// Gets the blob content in a <see cref="Stream"/>.
/// </summary>
public virtual Stream GetContentStream();
/// <summary>
/// Gets the blob content in a <see cref="Stream"/> as it would be
/// checked out to the working directory.
/// <param name="filteringOptions">Parameter controlling content filtering behavior</param>
/// </summary>
public virtual Stream GetContentStream(FilteringOptions filteringOptions); |
Can someone please merge this PR? This issue has been known (with a known fix) for years now (issue #528). I have been forced to use a fork with this fix, and then absentmindedly replaced it with the latest from the mainline, and got bit by this issue again.. |
6d0161d
to
e99fc2d
Compare
@pmiossec Would you mind taking a look at this? |
I planned to do it the noon but failed to find time.
I had a quick look yesterday but fail to really understand the problem and
the solution.
And because I no more use TFVC (and that since CodePLex shutdown, we don't
have a smoke test env to detect regressions), I can't test it :(
Could you explain it in easy understanding words?
Is there a possibility of regression for those not using `autocrlf=true`?
I'm ready to merge it but don't want to introduce a regression...
…On Fri, 25 Jan 2019 at 16:20, m-akinc ***@***.***> wrote:
@pmiossec <https://github.com/pmiossec> Would you mind taking a look at
this?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1210 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAcFpH3d2R12sxVDr3_hZbQ5a1u8kR2kks5vGyCygaJpZM4VTdG1>
.
|
In fact, seems ok... |
Thanks a lot. |
As I could not test anymore complex PR, I wait to have comments by users testing some PR.
Which fork? your own? |
It was not my current fork (the one I used for PR #1249 ). I had forked over a year ago to include two yet unmerged bug fixes: this line ending one, and another related to an out-of-memory error you fixed in PR #1138 . I had been using that build until earlier this week. Then I ran into the subdirectory delete bug, and I created a fresh fork, fixed the bug, and started using that build. But of course, it was missing this line ending fix. |
Ok. Thanks. |
Fixes #528
Default autocrlf is now set to the global core.autocrlf value instead of false(Original commit by @sopolenius)