From 5bf42916378b49f2790b4da91cb056cd9e08f686 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 7 Feb 2011 00:11:00 -0500
Subject: [PATCH] Further correction to tree entry sorting (for git fsck)

---
 src/tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tree.c b/src/tree.c
index d71cd37d4..bf1cdfa0f 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -50,10 +50,10 @@ static int cache_name_compare(const char *name1, int len1, int isdir1,
 	if (cmp)
 		return cmp;
 	if (len1 < len2)
-		return ((isdir1 == isdir2) ? -1 :
+		return ((!isdir1 && !isdir2) ? -1 :
                         (isdir1 ? '/' - name2[len1] : name2[len1] - '/'));
 	if (len1 > len2)
-		return ((isdir1 == isdir2) ? 1 :
+		return ((!isdir1 && !isdir2) ? 1 :
                         (isdir2 ? name1[len2] - '/' : '/' - name1[len2]));
 	return 0;
 }