Skip to content

Commit dc9b1a2

Browse files
jeffhostetlerdscho
authored andcommitted
dir.c: regression fix for add_excludes with fscache
Fix regression described in: #1392 which was introduced in: b235337 Problem Symptoms ================ When the user has a .gitignore file that is a symlink, the fscache optimization introduced above caused the stat-data from the symlink, rather that of the target file, to be returned. Later when the ignore file was read, the buffer length did not match the stat.st_size field and we called die("cannot use <path> as an exclude file") Optimization Rationale ====================== The above optimization calls lstat() before open() primarily to ask fscache if the file exists. It gets the current stat-data as a side effect essentially for free (since we already have it in memory). If the file does not exist, it does not need to call open(). And since very few directories have .gitignore files, we can greatly reduce time spent in the filesystem. Discussion of Fix ================= The above optimization calls lstat() rather than stat() because the fscache only intercepts lstat() calls. Calls to stat() stay directed to the mingw_stat() completly bypassing fscache. Furthermore, calls to mingw_stat() always call {open, fstat, close} so that symlinks are properly dereferenced, which adds *additional* open/close calls on top of what the original code in dir.c is doing. Since the problem only manifests for symlinks, we add code to overwrite the stat-data when the path is a symlink. This preserves the effect of the performance gains provided by the fscache in the normal case. Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 103a43e commit dc9b1a2

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

dir.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,13 +810,41 @@ static int add_excludes(const char *fname, const char *base, int baselen,
810810
size_t size = 0;
811811
char *buf;
812812

813+
/*
814+
* A performance optimization for status.
815+
*
816+
* During a status scan, git looks in each directory for a .gitignore
817+
* file before scanning the directory. Since .gitignore files are not
818+
* that common, we can waste a lot of time looking for files that are
819+
* not there. Fortunately, the fscache already knows if the directory
820+
* contains a .gitignore file, since it has already read the directory
821+
* and it already has the stat-data.
822+
*
823+
* If the fscache is enabled, use the fscache-lstat() interlude to see
824+
* if the file exists (in the fscache hash maps) before trying to open()
825+
* it.
826+
*
827+
* This causes problem when the .gitignore file is a symlink, because
828+
* we call lstat() rather than stat() on the symlnk and the resulting
829+
* stat-data is for the symlink itself rather than the target file.
830+
* We CANNOT use stat() here because the fscache DOES NOT install an
831+
* interlude for stat() and mingw_stat() always calls "open-fstat-close"
832+
* on the file and defeats the purpose of the optimization here. Since
833+
* symlinks are even more rare than .gitignore files, we force a fstat()
834+
* after our open() to get stat-data for the target file.
835+
*/
813836
if (is_fscache_enabled(fname)) {
814837
if (lstat(fname, &st) < 0) {
815838
fd = -1;
816839
} else {
817840
fd = open(fname, O_RDONLY);
818841
if (fd < 0)
819842
warn_on_fopen_errors(fname);
843+
else if (S_ISLNK(st.st_mode) && fstat(fd, &st) < 0) {
844+
warn_on_fopen_errors(fname);
845+
close(fd);
846+
fd = -1;
847+
}
820848
}
821849
} else {
822850
fd = open(fname, O_RDONLY);

0 commit comments

Comments
 (0)