Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Issue 2419613006: Re-add MHTML files so that they're represented with LF line endings. They'll still be CRLF on check… (Closed)

Created:
4 years, 2 months ago by Sidney San Martín
Modified:
4 years, 2 months ago
Reviewers:
Mark Mentovai
CC:
chromium-reviews, blink-reviews, jshin+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Re-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 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+879 lines, -879 lines) Patch
M third_party/WebKit/LayoutTests/mhtml/content_transfer_encoding_none.mht View 1 chunk +36 lines, -36 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary.mht View 1 chunk +18 lines, -18 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/invalid-bad-boundary2.mht View 1 chunk +41 lines, -41 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/mhtml-with-capital-mimetype-loading.mht View 1 chunk +22 lines, -22 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/multi_frames_ie.mht View 1 chunk +103 lines, -103 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/multi_frames_unmht.mht View 1 chunk +86 lines, -86 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_ie.mht View 1 chunk +75 lines, -75 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/page_with_css_and_js_unmht.mht View 1 chunk +70 lines, -70 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/page_with_image_ie.mht View 1 chunk +39 lines, -39 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/page_with_image_unmht.mht View 1 chunk +33 lines, -33 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/page_with_javascript.mht View 1 chunk +29 lines, -29 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/relative_url.mht View 1 chunk +42 lines, -42 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/relaxed-content-type-parameters.mht View 1 chunk +24 lines, -24 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/shared_buffer_bug.mht View 1 chunk +171 lines, -171 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/simple_page_ie.mht View 1 chunk +19 lines, -19 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/simple_page_unmht.mht View 1 chunk +23 lines, -23 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/transfer_encoding_7bit.mht View 1 chunk +22 lines, -22 lines 0 comments Download
M third_party/WebKit/LayoutTests/mhtml/transfer_encoding_8bit.mht View 1 chunk +26 lines, -26 lines 0 comments Download

Messages

Total messages: 9 (6 generated)
Sidney San Martín
Looks like this can't be landed through the CQ. I'll bug you to talk about ...
4 years, 2 months ago (2016-10-14 23:07:26 UTC) #6
Mark Mentovai
LGTM
4 years, 2 months ago (2016-10-17 13:33:04 UTC) #7
commit-bot: I haz the power
4 years, 2 months ago (2016-10-17 16:28:30 UTC) #9
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/89a9d64a0cdaba5a5f5be5a098b99769074bf623
Cr-Commit-Position: refs/heads/master@{#425694}

Powered by Google App Engine
This is Rietveld 408576698