push cpp files get as binary files - gerrit 3.6.1 server

[Guy Levkowitz]

Hi

we have some strange issue when sometimes developers push code of cpp files and it push as Binary and can't be diff 

see attached 

what can cause this issue - is there any solution to change it via Web UI ? 

thanks

Guy

[Rikard Almgren]

Not so much a fix via web UI, but it is likely due to CRLF vs LF [1] in the files.

It might require two changes to fix. e.g.

Change 1: Change all CRLF to LF (This will be Binary - Binary diff)

Change 2: Actual code-change to the file (this should show as an actual diff of code)

 

You can set Git to do autocrlf conversions via the core.autocrlf setting. [2]

thanks

Guy

[1] https://bugs.chromium.org/p/gerrit/issues/detail?id=16061 

[2] https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration

BR

Rikard

[Guy Levkowitz]

Actual code-change to the file (this should show as an actual diff of code)  - where is this code change needed to be done

i have open the file in VS2019  and make it as LF - still when push get the same 

ב-יום שני, 31 באוקטובר 2022 בשעה 15:10:07 UTC+2, Rikard Almgren כתב/ה:

[Rikard Almgren]

On Monday, 31 October 2022 at 15:15:34 UTC+1 sil...@gmail.com wrote:

Actual code-change to the file (this should show as an actual diff of code)  - where is this code change needed to be done

i have open the file in VS2019  and make it as LF - still when push get the same 

To clarify.

Change 1, e.g. Commit 1:
Change to LF

Change 2: Code-change.

2: Code-Change
1: Change to LF
0: Current main

It needs to be done in two separate changes. A single change will not suffice.

The code-change needs to be on top of the change to LF.

We had this issue on our 3.6.1 instance as well, and this is how we fixed it,
However, I currently can't reproduce the binary file issue. So I can't find a way to showcase the fix.

Unfortunately I don't have any other ideas on how to resolve it if it does not work for you.

[Kenyon Ralph]

I have seen this also with UTF-16 files, or UTF-8 files with byte order mark (I don't remember which). These tend to be created on Windows systems.

[David Ostrovsky]

Yes, this is a known issue with MS Visual Studio and UTF-16 encoding, see:

[1] https://crbug.com/gerrit/1468