Bug 421048

Summary:	Input from /dev/null rejected
Product:	[Applications] kdiff3	Reporter:	Thomas Koeller <thomas>
Component:	application	Assignee:	michael <reeves.87>
Status:	RESOLVED FIXED
Severity:	minor	CC:	soloturn
Priority:	NOR
Version First Reported In:	1.8.x
Target Milestone:	---
Platform:	Fedora RPMs
OS:	Linux
Latest Commit:	https://invent.kde.org/kde/kdiff3/commit/e68e44616f21600a21c1f1aadd181213071a5ea7	Version Fixed/Implemented In:	1.8.3
Sentry Crash Report:

Description Thomas Koeller 2020-05-05 08:44:58 UTC

I am using Kdiff3 as a merge tool with git. A while ago (don't remember exactly when), kdiff3 used to accept /dev/null as an input file, but that is no longer the case - I get an error saying '/dev/null is not a normal file'. This greatly limits the usefulness of kdiff3 in this context, as git passes /dev/null as one of the inputs for newly created or deleted files. If this happens I have to click away three dialog windows before I can continue. This is really annoying.

Comment 1 michael 2020-05-10 22:22:00 UTC

Git commit ff89da4849ef64f7adcd99ae71b615f177d5534f by Michael Reeves.
Committed on 10/05/2020 at 22:19.
Pushed by mreeves into branch '1.8'.

Fix compatibilty with git

Treat /dev/null as non-existant.
FIXED-IN:1.8.3

M  +2    -2    src/fileaccess.cpp

https://invent.kde.org/kde/kdiff3/commit/ff89da4849ef64f7adcd99ae71b615f177d5534f

Comment 2 michael 2020-05-10 22:22:01 UTC

Git commit e68e44616f21600a21c1f1aadd181213071a5ea7 by Michael Reeves.
Committed on 10/05/2020 at 20:24.
Pushed by mreeves into branch 'master'.

Fix compatibilty with git

Treat /dev/null as non-existant.
FIXED-IN:1.8.3

M  +2    -2    src/fileaccess.cpp

https://invent.kde.org/kde/kdiff3/commit/e68e44616f21600a21c1f1aadd181213071a5ea7

Comment 3 michael 2020-06-25 03:13:10 UTC

*** Bug 419950 has been marked as a duplicate of this bug. ***