X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=diff.c;h=23d454e71d4d22165d995d8fd321c86d2eeb84e4;hb=2675773af893ae81f9b09f18c1f2ec86ca2158e7;hp=608223ab567b6e3be3ba9d572c858b3bf6fd25eb;hpb=c7534ef4a12bb44806d522fc8e3961e390f9169b;p=git.git

diff --git a/diff.c b/diff.c
index 608223ab5..23d454e71 100644
--- a/diff.c
+++ b/diff.c
@@ -1311,6 +1311,8 @@ static const char *get_textconv(struct diff_filespec *one)
 {
 	if (!DIFF_FILE_VALID(one))
 		return NULL;
+	if (!S_ISREG(one->mode))
+		return NULL;
 	diff_filespec_load_driver(one);
 	return one->driver->textconv;
 }