diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:13:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:13:34 -0800 |
| commit | 0990e7aaaa63ca908dbdfc379af132068e4b066f (patch) | |
| tree | db4ecb6c21e8949a7735201f0fbfe0bcc25ed784 /unpack-trees.c | |
| parent | 9847a524321afbfa6dbb08bfd9b6a0746f965578 (diff) | |
| parent | bda6eb0da9b4e4e763b531c83cab9fd9f85934ff (diff) | |
| download | git-0990e7aaaa63ca908dbdfc379af132068e4b066f.tar.gz | |
Merge branch 'kb/lstat-cache'
* kb/lstat-cache:
lstat_cache(): introduce clear_lstat_cache() function
lstat_cache(): introduce invalidate_lstat_cache() function
lstat_cache(): introduce has_dirs_only_path() function
lstat_cache(): introduce has_symlink_or_noent_leading_path() function
lstat_cache(): more cache effective symlink/directory detection
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 15c9ef592b..16bc2ca9eb 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -61,7 +61,7 @@ static void unlink_entry(struct cache_entry *ce) char *cp, *prev; char *name = ce->name; - if (has_symlink_leading_path(ce_namelen(ce), ce->name)) + if (has_symlink_or_noent_leading_path(ce_namelen(ce), ce->name)) return; if (unlink(name)) return; @@ -580,7 +580,7 @@ static int verify_absent(struct cache_entry *ce, const char *action, if (o->index_only || o->reset || !o->update) return 0; - if (has_symlink_leading_path(ce_namelen(ce), ce->name)) + if (has_symlink_or_noent_leading_path(ce_namelen(ce), ce->name)) return 0; if (!lstat(ce->name, &st)) { |