diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-10 20:18:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-10 20:18:37 -0700 |
| commit | 20f3749977c0ea48538553dcd85b7cd445d43415 (patch) | |
| tree | 741ede36013b66f4ea3ee3521fcf0fbcca73ca50 /unpack-trees.c | |
| parent | 73ccb916e4e733745e1361739b07f1ef3e97ae6b (diff) | |
| parent | f62ce3de9dd4803f50f65e17f5fc03c7bdb49c40 (diff) | |
| download | git-20f3749977c0ea48538553dcd85b7cd445d43415.tar.gz | |
Merge branch 'lt/dir-cleanup'
* lt/dir-cleanup:
Make index preloading check the whole path to the file
Export thread-safe version of 'has_symlink_leading_path()'
Prepare symlink caching for thread-safety
Avoid using 'lstat()' to figure out directories
Avoid doing extra 'lstat()'s for d_type if we have an up-to-date cache entry
Simplify read_directory[_recursive]() arguments
Add 'fill_directory()' helper function for directory traversal
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 05d0bb1f85..42c7d7d563 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -551,7 +551,7 @@ static int verify_clean_subdirectory(struct cache_entry *ce, const char *action, memset(&d, 0, sizeof(d)); if (o->dir) d.exclude_per_dir = o->dir->exclude_per_dir; - i = read_directory(&d, ce->name, pathbuf, namelen+1, NULL); + i = read_directory(&d, pathbuf, namelen+1, NULL); if (i) return o->gently ? -1 : error(ERRORMSG(o, not_uptodate_dir), ce->name); |