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

New wiki format, Git and line-endings #999

Closed
keetron opened this issue Dec 8, 2016 · 4 comments
Closed

New wiki format, Git and line-endings #999

keetron opened this issue Dec 8, 2016 · 4 comments

Comments

@keetron
Copy link
Contributor

keetron commented Dec 8, 2016

When creating a new page using the latest FitNesse version, pushing said file to Git, removing the branch and pulling the branch back to local, the properties at the beginning of the file are no longer seen as properties. The result is the page is not viewed as a test but as a Static page. The Help text is also gone and in FitNesse the properties are displayed with a strike-through.

We suspect this is due to line endings changing when going to Git and back and the latest FitNesse version being somewhat intolerant to this.
Attached two files, a before and an after. I hope the zipping didn't mess up my point :-)

wikifiles.zip

@amolenaar
Copy link
Collaborator

Thanks for the report. You're working on Windows?

@keetron
Copy link
Contributor Author

keetron commented Dec 8, 2016

We are using Windows 7 as a dev machine, the git server is a Linux machine.
The description was to specifically point out that only when pushing and pulling to remote, this happens.
For now, until this is resolved I'll set all updated projects back to the old-style wiki pages with folders so that no tests are left behind by Jenkins.

@fhoeben
Copy link
Collaborator

fhoeben commented Dec 20, 2016

It appears a '.gitattributes' file in the FitNesseRoot directory also works, if we explicitly set all .wiki files to have only 'lf' line endings (and not Windows standard 'crlf').

So inside the FitNesseRoot directory we can add a '.gitattributes' file with contents:

*.wiki text eol=lf

This seems to leave the new style wiki pages in working condition.

Is there indeed a requirement in the .wiki format for the line endings (for the entire file, or the first part of the file containing the properties)?

@keetron
Copy link
Contributor Author

keetron commented Feb 12, 2017

With commit d559513 this should be fixed.

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

No branches or pull requests

3 participants