Diff of added binary file shows unrelated content

[mstv]

Environment

• Git Extensions 33.33.33
• Build c47e283
• Git 2.44.0.windows.1
• Microsoft Windows NT 10.0.19045.0
• .NET 8.0.3
• DPI 96dpi (no scaling)
• Portable: False

Issue description

alleged filename "syscolor 3 gray.7z" instead of "color-binary.diff":

alleged filename "PatchProcessor.cs" instead of "color.diff"

Steps to reproduce

view commit 0147775

Did this work in previous version of GitExtensions?

4.2.1 is affected, too

Diagnostics

2024-03-17T14:06:26.0751623+01:00	46	10988	UI	1	git	config --get ą	
2024-03-17T14:06:26.1376841+01:00	40	8644	UI	0	git	--version	
2024-03-17T14:06:27.4267160+01:00	50	29048	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:06:27.6126242+01:00	44	5244		0	C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe	-latest -property productPath	
2024-03-17T14:06:27.9866371+01:00	42	6356	UI	1	git	symbolic-ref --quiet HEAD	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.0372319+01:00	44	16364	UI	0	git	rev-parse --git-common-dir	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.0871870+01:00	55	25216		0	git	rev-parse HEAD	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.0910212+01:00	79	22348		0	git	stash list -z --pretty=format:"%H%T%P%n%at%n%ct%n%aN%n%aE%n%cN%n%cE%n%gD%n%B"	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.0920770+01:00	76	20892		0	git	--no-optional-locks for-each-ref --format="%(if)%(authordate)%(then)%(objectname) %(refname)%(else)%(*objectname) %(*refname)%(end)"	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.0932581+01:00	412	28776		0	git	-c log.showSignature=false log -z --pretty=format:"%H%T%P%n%at%n%ct%n%aN%n%aE%n%cN%n%cE%n%B" --exclude=refs/notes/commits --all --	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.1080144+01:00	46	16076	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.1789248+01:00	86	29652		0	git	for-each-ref --format="%(push:track,nobracket)::%(upstream:track,nobracket)::%(push)::%(upstream)::%(refname:short)" refs/heads/	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.2726211+01:00	46	24572		0	git	remote -v	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.6341390+01:00	43	28692		0	git	remote	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.6867617+01:00	147	6212		0	git	--no-optional-locks -c diff.ignoreSubmodules=none status --porcelain=2 -z --untracked-files	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.7179883+01:00	56	21636		0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false diff --find-renames --find-copies --name-status -z "2b42073c20803b92e694c38acbe907b318ff9343" "c47e28380cca524ce69a96ea0038c6099d4bfaa3"	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.7614841+01:00	67	27032		0	git	for-each-ref --sort="-taggerdate" --format="%(refname)" refs/tags/	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.7641137+01:00	88	29464		0	git	branch --format="%(refname)" -a --merged "c47e28380cca524ce69a96ea0038c6099d4bfaa3"	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.8170561+01:00	88	380		0	git	branch -a --contains c47e28380cca524ce69a96ea0038c6099d4bfaa3	D:\Build\gitextensions3_dev\
2024-03-17T14:06:28.9035312+01:00	52	20312	UI	0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false -c diff.colorMoved=zebra -c diff.colorMovedWS=no -c color.diff.old="#000000 #ffc8c8" -c color.diff.new="#000000 #c8ffc8" diff --find-renames --find-copies --color=always --unified=3 "2b42073c20803b92e694c38acbe907b318ff9343" "c47e28380cca524ce69a96ea0038c6099d4bfaa3" -- "GitUI/NBugReports/BugReportInvoker.cs"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:20.5681304+01:00	55	22236		0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false diff --find-renames --find-copies --name-status -z "c47e28380cca524ce69a96ea0038c6099d4bfaa3" "0147775e76f9d4278d3a30502240b9b019e3f795"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:20.5725138+01:00	70	7580		0	git	branch --format="%(refname)" -a --merged "0147775e76f9d4278d3a30502240b9b019e3f795"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:20.5824485+01:00	77	3584		0	git	branch -a --contains 0147775e76f9d4278d3a30502240b9b019e3f795	D:\Build\gitextensions3_dev\
2024-03-17T14:07:20.7003997+01:00	54	23056	UI	0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false -c diff.colorMoved=zebra -c diff.colorMovedWS=no -c color.diff.old="#000000 #ffc8c8" -c color.diff.new="#000000 #c8ffc8" diff --find-renames --find-copies --color=always --unified=3 "c47e28380cca524ce69a96ea0038c6099d4bfaa3" "0147775e76f9d4278d3a30502240b9b019e3f795" -- "GitCommands/Patches/PatchProcessor.cs"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:27.6805330+01:00	50	2976	UI	0	git	ls-tree -r 0147775e76f9d4278d3a30502240b9b019e3f795 -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:27.7333087+01:00	48	1164		0	git	cat-file blob "0bfb326139bbb897737917dd223e75973f6e7b6b"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:27.8132825+01:00	44	6000	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:33.5658524+01:00	52	7984	UI	0	git	ls-tree -r 0147775e76f9d4278d3a30502240b9b019e3f795 -- "UnitTests/GitCommands.Tests/Patches/testdata/color-binary.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:33.6179789+01:00	49	22244		0	git	cat-file blob "b260585f00931947a71d8eccad15c3f70648d296"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:33.6928119+01:00	43	11668	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color-binary.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:35.0014676+01:00	57	25092	UI	0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false -c diff.colorMoved=zebra -c diff.colorMovedWS=no -c color.diff.old="#000000 #ffc8c8" -c color.diff.new="#000000 #c8ffc8" diff --find-renames --find-copies --color=always --unified=3 "c47e28380cca524ce69a96ea0038c6099d4bfaa3" "0147775e76f9d4278d3a30502240b9b019e3f795" -- "UnitTests/GitCommands.Tests/Patches/PatchTest.cs"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:35.5790560+01:00	50	20176	UI	0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false -c diff.colorMoved=zebra -c diff.colorMovedWS=no -c color.diff.old="#000000 #ffc8c8" -c color.diff.new="#000000 #c8ffc8" diff --find-renames --find-copies --color=always --unified=3 "c47e28380cca524ce69a96ea0038c6099d4bfaa3" "0147775e76f9d4278d3a30502240b9b019e3f795" -- "UnitTests/GitCommands.Tests/Patches/PatchProcessorTest.cs"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:38.0939967+01:00	43	10316	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:43.5206914+01:00	53	16908	UI	0	git	-c color.ui=never -c diff.submodule=short -c diff.noprefix=false -c diff.mnemonicprefix=false -c diff.ignoreSubmodules=none -c core.safecrlf=false -c diff.colorMoved=zebra -c diff.colorMovedWS=no -c color.diff.old="#000000 #ffc8c8" -c color.diff.new="#000000 #c8ffc8" diff --find-renames --find-copies --color=always --inter-hunk-context=9000 --unified=9000 "c47e28380cca524ce69a96ea0038c6099d4bfaa3" "0147775e76f9d4278d3a30502240b9b019e3f795" -- "GitCommands/Patches/PatchProcessor.cs"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:46.8693919+01:00	45	15588	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:55.0008282+01:00	43	11824	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:07:58.6908941+01:00	42	21700	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:08:03.8124530+01:00	42	17692	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color-binary.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:08:07.4342300+01:00	42	29576	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:08:11.1103591+01:00	32	25948	UI	0	dotnet	--list-runtimes	
2024-03-17T14:08:59.3774095+01:00	46	18636	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:09:14.1547497+01:00	47	12580	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:09:15.6208094+01:00	43	18644	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:09:24.5328895+01:00	42	17020	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:09:25.7016614+01:00	46	11684	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:09:51.2594483+01:00	48	12236	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:09:52.2841094+01:00	42	10480	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:00.2542922+01:00	43	21216	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:02.1274613+01:00	45	19148	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color-binary.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:10:07.1751794+01:00	45	5516	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:11.8908152+01:00	41	4140	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:25.0923000+01:00	44	12708	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:29.4008037+01:00	41	15364	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:34.9375820+01:00	42	6408	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:49.6052378+01:00	41	6252	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:53.5909372+01:00	44	19360	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:10:56.9159027+01:00	42	20632	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:11:07.8002053+01:00	42	29384	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:11:09.2118542+01:00	45	15280	UI	0	git	check-attr -z diff text crlf eol -- "UnitTests/GitCommands.Tests/Patches/testdata/color.diff"	D:\Build\gitextensions3_dev\
2024-03-17T14:11:15.6200758+01:00	43	25932	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:11:28.7304651+01:00	119	3656		0	git	--no-optional-locks -c diff.ignoreSubmodules=none status --porcelain=2 -z --untracked-files	D:\Build\gitextensions3_dev\
2024-03-17T14:11:35.2857718+01:00	41	29516	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:11:48.6673219+01:00	44	3576	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\
2024-03-17T14:12:19.3072890+01:00	43	22772	UI	0	git	ls-files -z --unmerged	D:\Build\gitextensions3_dev\

[gerhardol]

This is due to the test file color-binary.diff has another name inside.
The file is displayed correctly.
It is the same in FileTree, see existing UnitTests/GitCommands.Tests/Patches/testdata/rebase.diff
(the .diff file could contain several patches too)

But I could change these specific files

[gerhardol]

See also last commit of #11628 that colors .diff and .patch files as other diffs

[mstv]

Sorry, it somehow looked too similar to the actual commit.
I still would like to have a header for added files (like for binary files f.i.) - also in other situations. Here, it would have prevented me from getting confused.

[gerhardol]

I still would like to have a header for added files (like for binary files f.i.) - also in other situations. Here, it would have prevented me from getting confused.

Maybe binary files should always be presented as new files