Author Topic: Beta2: git diff against workarea file always complains about EOL  (Read 2578 times)

Marcel

  • Senior Community Member
  • Posts: 242
  • Hero Points: 26
Beta2: git diff against workarea file always complains about EOL
« on: September 04, 2014, 03:09:22 am »
On Windows, a git diff of an earlier commit against the current workarea file always brings up the EOL character mismatch dialog.  This is only amusing the first few times, after that it is just annoying. Is there a way to disable this warning and let diff use a default?

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2481
  • Hero Points: 137
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #1 on: September 04, 2014, 12:19:21 pm »
Right now there's no way to disable it, but we will consider this.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2481
  • Hero Points: 137
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #2 on: September 04, 2014, 01:51:23 pm »
Did the EOL chars change?  Do you think the message is erroneous, or is it just annoying because you already know that there was a change?

Marcel

  • Senior Community Member
  • Posts: 242
  • Hero Points: 26
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #3 on: September 04, 2014, 02:16:55 pm »
This is just a guess, but the checked out workspace files (this being Windows) have cr/lf delimiters whereas the temporary diff copy SE builds from the commit has Linux line delimiters. There is probably a git command line option SE could use to make the latter match the workspace format.

jporkkahtc

  • Senior Community Member
  • Posts: 2067
  • Hero Points: 188
  • Text
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #4 on: September 04, 2014, 08:39:27 pm »
I see this with PERFORCE as well ... except for me, I have set the P4 client to "UNIX" line endings, so there should never be a case where the file has CRLF.
LineEnd:        unix
I just checked, the local file only has LF.
But, the file that VS copies from the version control system has CRLF throughout.


I just tried "p4 print //depot/branch/....../file.c" > blat

I found that "blat" has LF only line ending.


VS appears to be doing something to change the file to CRLF.




Another issue: In "Diff file with most up to date": [size=78%]Right-clicking on the RHS file and picking "edit file (will close this dialog)" doesn't do anything.[/size]


Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2481
  • Hero Points: 137
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #5 on: September 04, 2014, 08:42:49 pm »
Hm, I don't think we write temp files for Perforce.  We communicate with a pipe and it goes straight to an editor buffer.  I wonder what the difference is.

jporkkahtc

  • Senior Community Member
  • Posts: 2067
  • Hero Points: 188
  • Text
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #6 on: September 04, 2014, 08:44:13 pm »
What are you using to set up the pipe?
STDIO?
I bet there is a binary option to set.


Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2481
  • Hero Points: 137
Re: Beta2: git diff against workarea file always complains about EOL
« Reply #7 on: September 18, 2014, 02:06:55 pm »
On Windows, a git diff of an earlier commit against the current workarea file always brings up the EOL character mismatch dialog.  This is only amusing the first few times, after that it is just annoying. Is there a way to disable this warning and let diff use a default?
What git client are you using?