Skip to content

Conversation

@pokey
Copy link
Member

@pokey pokey commented Apr 20, 2022

Checklist

@pokey pokey mentioned this pull request Apr 20, 2022
@pokey pokey force-pushed the pokey-run-pre-commit branch from 3668596 to 90a89d6 Compare April 20, 2022 19:06
@pokey pokey changed the base branch from pokey-pre-commit to main April 20, 2022 19:07
@pokey pokey changed the base branch from main to pokey-pre-commit April 20, 2022 19:09
@@ -1 +1 @@
hello world
hello world
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the added new line here is causing tests to fail; easy fix

@pokey pokey force-pushed the pokey-run-pre-commit branch 3 times, most recently from 37b9f85 to 1168bf8 Compare April 24, 2022 16:17
Base automatically changed from pokey-pre-commit to main April 24, 2022 16:26
@pokey pokey force-pushed the pokey-run-pre-commit branch from 1168bf8 to 94c4f4a Compare April 24, 2022 16:27
@pokey pokey changed the title Result of running pre-commit Run pre-commit Apr 24, 2022
@auscompgeek
Copy link
Member

Maybe add a .gitattributes with

*  text=auto eol=lf

which should force CI on Windows to check out the file with Unix line endings.

@pokey
Copy link
Member Author

pokey commented Apr 25, 2022

Maybe add a .gitattributes with

*  text=auto eol=lf

which should force CI on Windows to check out the file with Unix line endings.

Ok so first of all TIL so thanks for that 😄

Any objection to just doing https://github.com/cursorless-dev/cursorless/pull/638/files#diff-bcd60fce722e3a07bb2e897fc863f9e0f9baff1e2667a348730b3ee310d85661R72? Seems simpler, and doesn't really alter the goal of the test, which is to ensure that it is opening the correct document

@pokey pokey requested a review from AndreasArvidsson April 25, 2022 10:14
@pokey pokey force-pushed the pokey-run-pre-commit branch from 30a8ef7 to 4c06767 Compare April 25, 2022 10:22
@pokey
Copy link
Member Author

pokey commented Apr 25, 2022

Fwiw I've split this PR into 2 commits. The first commit (c8815db) consists of manual changes which have some (slight 😊) substance. The second commit (4c06767) is purely automated and just does the automated pre-commit fixes. I'll merge these in without squashing, so that the latter can be added to .git-blame-ignore-revs without including the manual changes. cc/ @phillco @auscompgeek

@pokey pokey merged commit 4c06767 into main Apr 25, 2022
@pokey pokey deleted the pokey-run-pre-commit branch April 25, 2022 12:26
@pokey pokey temporarily deployed to production April 25, 2022 12:26 Inactive
@pokey pokey temporarily deployed to production April 25, 2022 12:32 Inactive
@pokey pokey temporarily deployed to production April 25, 2022 12:37 Inactive
@pokey pokey temporarily deployed to production April 25, 2022 12:37 Inactive
@phillco
Copy link
Member

phillco commented Apr 25, 2022

Nice, I'm always in favor of splitting it that way :)

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.

4 participants