development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-07 19:39:27 +00:00
Code Issues Projects Releases Wiki Activity

ls-files --others --directory: fix a bug with index entry ordering

Browse Source 
When both howto-index.sh and howto/make-dist.txt exist under
Documentation/ directory, dir_exists() mistakenly checked it
without the trailing slash to see if there was something under
Documentation/howto directory, and did not realize there was,
because '-' sorts earlier than '/' and cache_name_pos() finds
howto-index.sh, which is not under howto/ directory.  This
caused --others --directory to show it which was incorrect.

Check the directory name with the trailing slash, because having
an entry that has such as a prefix is what we are looking for.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-01-07 14:32:09 -08:00
parent 9518eb2629
commit 657907e76e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ls-files.c
View File

@ -240,11 +240,9 @@ static int dir_exists(const char *dirname, int len)
if (pos >= 0)
return 1;
pos = -pos-1;
if (pos >= active_nr)
if (pos >= active_nr) /* can't */
return 0;
if (strncmp(active_cache[pos]->name, dirname, len))
return 0;
return active_cache[pos]->name[len] == '/';
return !strncmp(active_cache[pos]->name, dirname, len);
}
/*
@ -294,11 +292,10 @@ static void read_directory(const char *path, const char *base, int baselen)
continue;
/* fallthrough */
case DT_DIR:
if (show_other_directories) {
if (!dir_exists(fullname, baselen + len))
break;
}
memcpy(fullname + baselen + len, "/", 2);
if (show_other_directories &&
!dir_exists(fullname, baselen + len + 1))
break;
read_directory(fullname, fullname,
baselen + len + 1);
continue;