From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 20 May 2005 16:11:46 +0000 (-0700)
Subject: diff-tree: use new base_name_compare() helper function
X-Git-Tag: v0.99~527
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e46091d5f3da713cd3c141ce0bfcd805c6d0ddf8;p=git.git

diff-tree: use new base_name_compare() helper function

This fixes diff-tree sorting of directories vs files (we used to
use just the regular cache_name_compare() which only works on
full file pathnames).
---

diff --git a/diff-tree.c b/diff-tree.c
index 5559dd3d..3bf88998 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -107,7 +107,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 
 	pathlen1 = strlen(path1);
 	pathlen2 = strlen(path2);
-	cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
+	cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
 	if (cmp < 0) {
 		show_file("-", tree1, size1, base);
 		return -1;