Details
-
Type:
Task
-
Status:
Resolved
-
Priority:
Minor
-
Resolution: Fixed
-
Affects Version/s: 3.5.4
-
Fix Version/s: 3.6
-
Component/s: Core, Core Examples
-
Labels:None
-
Number of attachments :
Description
reading the commit from brian earlier I noticed that some files are checked in with CR/LF line endings, which breaks diffs if the file is later checked in without CR-LF line endings (usually git should take care of this, but it doesn't work if the source file isn't converted beforehand)
I would suggest to change all source files to LF line endings, this creates massive diffs once, but at least then any further diff will look correct.
I have to check which files are actually affected, but I noticed it on examples/spring-security
Activity
Added 'Core Examples' component.
Mauro Talevi
added a comment - Added 'Core Examples' component. https://github.com/alexlehm/jbehave-core/commit/b6c2f6f3961985bc4114e347a1345d8c98952381
JBEHAVE-727: Some source code is checked in with CR/LF line endings
removed cr/lf line endings from all text files, the change contains no changes except for the lf changes
I hope this doesn't cause problems, since the diff is always the complete file
Alexander Lehmann
added a comment - - edited https://github.com/alexlehm/jbehave-core/commit/b6c2f6f3961985bc4114e347a1345d8c98952381
JBEHAVE-727 : Some source code is checked in with CR/LF line endings
removed cr/lf line endings from all text files, the change contains no changes except for the lf changes
I hope this doesn't cause problems, since the diff is always the complete file Did you follow the approach suggested in http://help.github.com/line-endings ?
Your commit is already out of sync because of the changes to spring-security example that have been committed in the last couple of days.
Better to redo it - possibly scripting it as above.
Mauro Talevi
added a comment - Did you follow the approach suggested in http://help.github.com/line-endings ?
Your commit is already out of sync because of the changes to spring-security example that have been committed in the last couple of days.
Better to redo it - possibly scripting it as above. In Windows I use autocrlf, however I changed the files on Linux with gnu recode, the result should be the same.
I will redo the changes with suggested approach again.
Alexander Lehmann
added a comment - In Windows I use autocrlf, however I changed the files on Linux with gnu recode, the result should be the same.
I will redo the changes with suggested approach again.
https://github.com/alexlehm/jbehave-core/commit/a10f1b4f0c802d04e6509284347d8aeed06558d1
applied cr-lf changes to current head
Alexander Lehmann
added a comment - https://github.com/alexlehm/jbehave-core/commit/a10f1b4f0c802d04e6509284347d8aeed06558d1
applied cr-lf changes to current head
apparently autocrlf is only processed if files are added, I have changed the files with recode
except for a strange javascript minified file, the output of git diff --ignore-space-at-eol is empty
Alexander Lehmann
added a comment - apparently autocrlf is only processed if files are added, I have changed the files with recode
except for a strange javascript minified file, the output of git diff --ignore-space-at-eol is empty
Mauro Talevi
made changes -
| Field | Original Value | New Value |
|---|---|---|
| Issue Type | Bug [ 1 ] | Task [ 3 ] |
| Fix Version/s | 3.6 [ 17721 ] | |
| Component/s | Core Examples [ 15469 ] |
Pulled commit with thanks.
Mauro Talevi
added a comment - Pulled commit with thanks. Mauro Talevi
made changes -
| Status | Open [ 1 ] | Resolved [ 5 ] |
| Resolution | Fixed [ 1 ] |
(btw, the JIRA is missing a component Examples I think)
I will do a thorough search for DOS files this evening, no time right now