Re: Autoformat source code issue

2020-04-21 Thread Guillaume Nodet
Merge yours, I'll try another ackk (remove / add back) tomorrow. Le mar. 21 avr. 2020 à 19:44, Lyor Goldstein a écrit : > >> >> Could you try with https://github.com/gnodet/mina-sshd/tree/SSHD-978 > and see if it's stable for you > > Works for me - except BCrypt.java seems to still require

Re: Autoformat source code issue

2020-04-21 Thread Lyor Goldstein
>> >> Could you try with https://github.com/gnodet/mina-sshd/tree/SSHD-978 and see if it's stable for you Works for me - except BCrypt.java seems to still require CRLF changes somehow I guess it will keep doing that every time we "ping pong" commits for it. I therefore think since it is the

Re: Autoformat source code issue

2020-04-21 Thread Lyor Goldstein
>> I can still see mixed lf / crlf in the BCrypt.java file, so I'll push another commit to get rid of those. I saw the same and tried to get rid of them - no success either >> Could you try with https://github.com/gnodet/mina-sshd/tree/SSHD-978 and see if it's stable for you Will do - but if

Re: Autoformat source code issue

2020-04-21 Thread Lyor Goldstein
>> When working on an existing repo and modifying the .gitattributes, you may need to use the --renormalize option as indicated in https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings#refreshing-a-repository-after-changing-line-endings to fix the line endings. >>

Re: Autoformat source code issue

2020-04-20 Thread Guillaume Nodet
The plugin is definitely supposed to handle all line endings kind. I've boot up a windows 10 VM, cloned the git repo, built the whole sshd project. modified: sshd-common/src/main/java/org/apache/sshd/common/cipher/package.html modified:

Re: Autoformat source code issue

2020-04-20 Thread Jonathan Valliere
Did you delete the whole repo and re-clone it? I have no idea, I don’t use Windows for anything relating to work. On Mon, Apr 20, 2020 at 1:49 PM Lyor Goldstein wrote: > >> >> > https://stackoverflow.com/questions/21822650/disable-git-eol-conversions > >> >> You will probably have to checkout

Re: Autoformat source code issue

2020-04-20 Thread Lyor Goldstein
>> >> https://stackoverflow.com/questions/21822650/disable-git-eol-conversions >> >> You will probably have to checkout the repo again. >> Thx - I'll give it a try... No good - tried all sort of combinations for .gitconfig and .gitattributes but none worked quite frustrating - makes no

Re: Autoformat source code issue

2020-04-20 Thread Lyor Goldstein
>> https://stackoverflow.com/questions/21822650/disable-git-eol-conversions >> You will probably have to checkout the repo again. Thx - I'll give it a try...

Re: Autoformat source code issue

2020-04-20 Thread Jonathan Valliere
https://stackoverflow.com/questions/21822650/disable-git-eol-conversions You will probably have to checkout the repo again. On Mon, Apr 20, 2020 at 1:23 PM Lyor Goldstein wrote: > >> Maven auto format might be converting it back to LF then GIT gets > confused? Maybe just disable the

Re: Autoformat source code issue

2020-04-20 Thread Lyor Goldstein
>> Maven auto format might be converting it back to LF then GIT gets confused? Maybe just disable the conversion to CRLF? How do I do that ?

Re: Autoformat source code issue

2020-04-20 Thread Jonathan Valliere
Maven auto format might be converting it back to LF then GIT gets confused? Maybe just disable the conversion to CRLF? On Mon, Apr 20, 2020 at 11:03 AM Lyor Goldstein wrote: > >> I thought GIT does this automatically on Windows. > > Not entirely - there are some core settings that control it,

Re: Autoformat source code issue

2020-04-20 Thread Lyor Goldstein
>> I thought GIT does this automatically on Windows. Not entirely - there are some core settings that control it, but it is not clear how they affect the behavior. My current setup in .gitconfig is shown below: [core] autocrlf = input filemode = false I have been using it so far

Re: Autoformat source code issue

2020-04-20 Thread Jonathan Valliere
I thought GIT does this automatically on Windows. On Mon, Apr 20, 2020 at 10:30 AM Lyor Goldstein wrote: > I have just fetched the latest master branch and built it on my Windows > machine and am getting as if all files have been changed - the change has > to do with LF -> CRLF change in all

Autoformat source code issue

2020-04-20 Thread Lyor Goldstein
I have just fetched the latest master branch and built it on my Windows machine and am getting as if all files have been changed - the change has to do with LF -> CRLF change in all files. How do we prevent this from happening? Personally I prefer LF, but let's make sure that building on Linux or