From e46091d5f3da713cd3c141ce0bfcd805c6d0ddf8 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 20 May 2005 09:11:46 -0700 Subject: [PATCH] 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-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-tree.c b/diff-tree.c index 5559dd3d8..3bf889987 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; -- 2.26.2