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

Strip trailing whitespace in quickform package #209

Merged
merged 1 commit into from
May 9, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

We have a situation where we have a proposed change (from @monishdeb ) that is hard to read because of the trailing spaces being stripped - this is hard to avoid for anyone using an IDE or decent editor since trailing whitespaces are against our standard.

OTOH the upstream QF package is basically dead so we don't gain from keeping in sync with it.

It is easier to review this if you add w=1 to the url - ie. https://github.com/civicrm/civicrm-packages/compare/master...eileenmcnaughton:white?expand=1&w=1

This is not a full whitespace tidy up - in fact line endings are still set to windows :-(
But, by stripping the trailing ones we make legible PRs much more possible

This is not a full whitespace tidy up - in fact line endings are still set to windows :-(
But, by stripping the trailing ones we make legible PRs much more possible
@seamuslee001
Copy link
Contributor

I believe its ok to merge as is, I think trailing whistpace is just something we should do with upgrades giving this merge on pass as all changes are whitespace only

@eileenmcnaughton eileenmcnaughton merged commit 4794c1c into civicrm:master May 9, 2018
@eileenmcnaughton eileenmcnaughton deleted the white branch May 9, 2018 04:56
@eileenmcnaughton
Copy link
Contributor Author

test bot killed but was running ok

@monishdeb
Copy link
Member

monishdeb commented May 9, 2018

Ahh right, it's my IDE atom which automatically strips whitespace whenever I open a file which I realised later on git diff. Thanks @eileenmcnaughton @seamuslee001 now I don't have worry about whitespaces in QF and my patch would be much cleaner :)

@eileenmcnaughton
Copy link
Contributor Author

@monishdeb - you are not alone with a whitespace stripping IDE - mine wanted to convert line endings too but I kept that out

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants