commit 413ea19d0efd603a9eb4da8dda7129f1e2432ca7
from: Stefan Sperling <stsp@stsp.name>
date: Thu Nov 30 00:44:46 2017 UTC

simplify

commit - 4209f7906dd87a54d8efb26b7180f94272d4255a
commit + 413ea19d0efd603a9eb4da8dda7129f1e2432ca7
blob - 86727484622aa1f8e7e7408c3c23782ed22d379e
blob + af6392d14f0d88c25bf043d9cc09487c95d82b94
--- lib/diff.c
+++ lib/diff.c
@@ -197,10 +197,9 @@ diff_entry_old_new(struct got_tree_entry *te1, struct 
 	} else if (S_ISREG(te1->mode) && S_ISREG(te2->mode)) {
 		if (!same_id(&te1->id, &te2->id))
 			return diff_modified_blob(&te1->id, &te2->id);
-	} else
-		return diff_kind_mismatch(&te1->id, &te2->id);
+	}
 
-	return NULL;
+	return diff_kind_mismatch(&te1->id, &te2->id);
 }
 
 static const struct got_error *