Images and other binary files not shown in diff

[mleyen]

• Gitea version (or commit ref): 1.12.5
• Git version: 2.25.1
• Operating system: Ubuntu 20.04.1 LTS
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite
• Can you reproduce the bug at https://try.gitea.io:
  • Yes (provide example URL)
  • No
  • Not relevant
• Log gist:

Description

Images no longer display in the Web interface when viewing a commit's diff. Instead, they only display an empty line with the "BIN" label, and no filename. This is true for any binary file, as well as empty files.

Screenshots

[zeripath]

Damn this one is gonna be something to do with the new diff header reading code.

[zeripath]

The problem will be in here

gitea/services/gitdiff/gitdiff.go

Line 446 in 144fa5a

func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*Diff, error) {

And the issue will be that the bin diff isn't matched properly.

This is really a lot of fun because it appears that the diff is:

diff --git a/gitea-sm.png b/gitea-sm.png
new file mode 100644
index 0000000..0ae375c
Binary files /dev/null and b/gitea-sm.png differ

Similarly for the empty file problem:

diff --git a/.gitkeep b/.gitkeep
new file mode 100644
index 0000000..e69de29

We can't easily determine the file name from the diff line:

Consider https://try.gitea.io/arandomer/pathological/commit/f4c9cf62d8e5c8720e2e11d608306065da05343d its diff is:

diff --git a/b b/b b/b b/b b/b b/b
similarity index 100%
rename from b b/b
rename to b b/b b/b b/b
diff --git a/b b/b b/b b/b b/b b/b
similarity index 100%
rename from b
rename to b b/b b/b b/b b/b

I just don't know how we're supposed to be able to parse these diffs in a non-breaking way...

[zeripath]

Ah --src-prefix and --dst-prefix can be used to force the damned paths to be escaped.

Now just need to check if we can use those in early gits.

[ratuka]

Any news about this?

[Vangelis66]

@wolfbeast:

This bug is still present in the newly migrated (GitHub -> Gitea 1.12.5) MoonchildProductions repositories, e.g.

https://repo.palemoon.org/MoonchildProductions/Pale-Moon/commit/85f7050

Just thought you should know... 😄
Best regards.

[wolfbeast]

Please don't @ mention me unless you explicitly need my input.

[techknowlogick]

Locking this as the issue is closed, and will be included in the next release.