summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-08-09 17:43:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-10 18:16:20 (GMT)
commitccad42d4836e2bb4d1843eccd94f58f0189abb1d (patch)
tree90dc8c7392cf41ffa3ba26c68dc6fbe17f3c7653 /read-cache.c
parentd31f3ad23dd1aee3c3e1015a43b02b995c01a9a1 (diff)
downloadgit-ccad42d4836e2bb4d1843eccd94f58f0189abb1d.zip
git-ccad42d4836e2bb4d1843eccd94f58f0189abb1d.tar.gz
git-ccad42d4836e2bb4d1843eccd94f58f0189abb1d.tar.bz2
read-cache: check for leading symlinks when refreshing index
Don't add paths with leading symlinks to the index while refreshing; we only track those symlinks themselves. We already ignore them while preloading (see read_index_preload.c). Reported-by: Nikolay Avdeev <avdeev@math.vsu.ru> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 4b4effd..5c234cb 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1044,6 +1044,14 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
return ce;
}
+ if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
+ if (ignore_missing)
+ return ce;
+ if (err)
+ *err = ENOENT;
+ return NULL;
+ }
+
if (lstat(ce->name, &st) < 0) {
if (ignore_missing && errno == ENOENT)
return ce;