From: Linus Torvalds Date: Wed, 11 Apr 2007 21:39:12 +0000 (-0700) Subject: Fix thinko in subproject entry sorting X-Git-Tag: v1.5.2-rc0~19^2~10 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1833a925484675b328d5df04ffca62efa7a0a012;p=git.git Fix thinko in subproject entry sorting This fixes a total thinko in my original series: subprojects do *not* sort like directories, because the index is sorted purely by full pathname, and since a subproject shows up in the index as a normal NUL-terminated string, it never has the issues with sorting with the '/' at the end. So if you have a subproject "proj" and a file "proj.c", the subproject sorts alphabetically before the file in the index (and must thus also sort that way in a tree object, since trees sort as the index). In contrast, it you have two files "proj/file" and "proj.c", the "proj.c" will sort alphabetically before "proj/file" in the index. The index itself, of course, does not actually contain an entry "proj/", but in the *tree* that gets written out, the tree entry "proj" will sort after the file entry "proj.c", which is the only real magic sorting rule. In other words: the magic sorting rule only affects tree entries, and *only* affects tree entries that point to other trees (ie are of the type S_IFDIR). Anyway, that thinko just means that we should remove the special case to make S_ISDIRLNK entries sort like S_ISDIR entries. They don't. They sort like normal files. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- diff --git a/read-cache.c b/read-cache.c index f458f5045..b8b6d11db 100644 --- a/read-cache.c +++ b/read-cache.c @@ -277,9 +277,9 @@ int base_name_compare(const char *name1, int len1, int mode1, return cmp; c1 = name1[len]; c2 = name2[len]; - if (!c1 && (S_ISDIR(mode1) || S_ISDIRLNK(mode1))) + if (!c1 && S_ISDIR(mode1)) c1 = '/'; - if (!c2 && (S_ISDIR(mode2) || S_ISDIRLNK(mode2))) + if (!c2 && S_ISDIR(mode2)) c2 = '/'; return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; }