diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 09:11:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 09:11:46 -0700 |
| commit | e46091d5f3da713cd3c141ce0bfcd805c6d0ddf8 (patch) | |
| tree | 0fa1459dec8dcef0dcf174b7077aa0faa16f6031 /diff-tree.c | |
| parent | 958ba6c96eb58b359c855c9d07e3e45072f0503e (diff) | |
| download | git-e46091d5f3da713cd3c141ce0bfcd805c6d0ddf8.tar.gz | |
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).
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index 5559dd3d8f..3bf8899873 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; |