commit e20293f22c3b2a1b5215653937598f272b1ce627
from: Stefan Sperling <stsp@stsp.name>
date: Sat Nov 17 15:35:27 2018 UTC

revert previous; it made a wrong assumption and broke diff

commit - 4b9176646e568036623abaee94c8cff7b5e37e09
commit + e20293f22c3b2a1b5215653937598f272b1ce627
blob - af94e1b578c120937895e8cd0f7ea38a83a45705
blob + be49c124bae5a2719cd00e9b503cad1467a5ad6e
--- lib/diff.c
+++ lib/diff.c
@@ -162,13 +162,7 @@ match_entry_by_name(struct got_tree_entry *te1, struct
 
 	entries2 = got_object_tree_get_entries(tree2); 
 	SIMPLEQ_FOREACH(te2, &entries2->head, entry) {
-		/* Note that tree entries are sorted in strcmp() order. */
-		int cmp = strcmp(te1->name, te2->name);
-		if (cmp < 0)
-			continue;
-		else if (cmp > 0)
-			break;
-		else
+		if (strcmp(te1->name, te2->name) == 0)
 			return te2;
 	}
 	return NULL;