Chromium Code Reviews
DescriptionRe-add MHTML files so that they're represented with LF line endings. They'll still be CRLF on checkout.
In crrev.com/bb2148f3eed355794122db8d31d5eed903c53ced, a .gitattributes
file with this line was added to the mhtml directory:
*.mht text eol=crlf
Git internally represents text files with LF line endings, but before
that file was created, the files were checked in with CRLFs. This is an
invalid state, but it doesn't show in a fresh clone or after `git reset
--hard` (probably some optimization in Git which assumes that
no files in a fresh repo can have changes).
You can trigger the issue by touching any .mht file in this directory.
For example:
touch third_party/WebKit/LayoutTests/mhtml/transfer_encoding_7bit.mht
Now, a `git status` will show that file as modified, and no combination
of `git checkout <file>` and `git reset <file>` will make it stop
showing up as modified. A `git reset --hard` on the whole repo will
restore Git's ignorance. You can also reveal the issue by
deleting/moving .git/index and then running `git reset` to recreate it:
all of these files will now show up as modified.
As far as I can tell, the right solution is to check all of these files
in again. This shouldn't have any observable effects other than the
issue described above no longer being reproducible.
Another option is to edit the .gitattributes file to treat these files
as binary.
BUG=656177
R=mark@chromium.org
Committed: https://crrev.com/89a9d64a0cdaba5a5f5be5a098b99769074bf623
Patch from Sidney San Martín <sdy@chromium.org>.
Cr-Commit-Position: refs/heads/master@{#425694}
Patch Set 1 #Messages
Total messages: 9 (6 generated)
|