X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=diff.c;h=02e948c9dd6244a0003c2c6bc81f55e46cf0ad2b;hb=76c3fb1f844753c4186975a483943e1970b3c4e2;hp=4e4e439e03f13a2bd9aaf63179ce50e4b72ed48e;hpb=9126f0091f271f090cc030a788219574ab0fea97;p=git.git

diff --git a/diff.c b/diff.c
index 4e4e439e0..02e948c9d 100644
--- a/diff.c
+++ b/diff.c
@@ -1509,6 +1509,10 @@ static void builtin_diff(const char *name_a,
 		b_prefix = o->b_prefix;
 	}
 
+	/* Never use a non-valid filename anywhere if at all possible */
+	name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
+	name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
+
 	a_one = quote_two(a_prefix, name_a + (*name_a == '/'));
 	b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
 	lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";