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

[dsmr] Update line endings #8433

Merged
merged 1 commit into from
Sep 9, 2020
Merged

Conversation

wborn
Copy link
Member

@wborn wborn commented Sep 8, 2020

In #8383 a .gitattributes file was modified but not all files were updated for the change.
On Linux I now often have modified files on new clones or when switching between branches.

Signed-off-by: Wouter Born <github@maindrain.net>
@wborn wborn requested a review from Hilbrand September 8, 2020 19:40
@Hilbrand
Copy link
Member

Hilbrand commented Sep 8, 2020

What did you change that causes the diffs? the line endings? or encoding? I'm curious why this wasn't correct, as if it wasn't correct I would have expected the unit tests to fail.

@wborn
Copy link
Member Author

wborn commented Sep 8, 2020

I haven't changed anything myself but Git does:

$ git clone git@github.com:openhab/openhab-addons.git
Cloning into 'openhab-addons'...
remote: Enumerating objects: 35, done.
remote: Counting objects: 100% (35/35), done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 371285 (delta 6), reused 27 (delta 4), pack-reused 371250
Receiving objects: 100% (371285/371285), 370.27 MiB | 11.11 MiB/s, done.
Resolving deltas: 100% (191921/191921), done.
$ cd openhab-addons/
$ git status
On branch 2.5.x
Your branch is up to date with 'origin/2.5.x'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Iskra_AM550.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_E350.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_ZCF110.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Sagemcom_XS210.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/ace4000.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_40.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_42.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_50.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/flu5.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/smarty.telegram
	modified:   bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/unregistered_meter.telegram

no changes added to commit (use "git add" and/or "git commit -a")

According to my editor these files are UTF-8 encoded with Windows line endings.

Copy link
Member

@Hilbrand Hilbrand left a comment

Choose a reason for hiding this comment

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

LGTM

@Hilbrand Hilbrand merged commit 7578fb2 into openhab:2.5.x Sep 9, 2020
@wborn wborn deleted the dsmr-lineendings branch September 9, 2020 08:01
CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Sep 12, 2020
Signed-off-by: Wouter Born <github@maindrain.net>
@wborn wborn added this to the 2.5.9 milestone Sep 18, 2020
markus7017 pushed a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
Signed-off-by: Wouter Born <github@maindrain.net>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Oct 8, 2020
Signed-off-by: Wouter Born <github@maindrain.net>
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.

2 participants