summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-30 21:35:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-30 21:35:36 (GMT)
commit9210c68d2af84d869f1635efe9a2092578653297 (patch)
tree3967574291f29eca2c480266658e2d4185370d66 /unpack-trees.c
parent84d06cdc06389ae7c462434cb7b1db0980f63860 (diff)
parentfab78a0c3defddff87ea5aa7dd32c5e444c43f1f (diff)
downloadgit-9210c68d2af84d869f1635efe9a2092578653297.zip
git-9210c68d2af84d869f1635efe9a2092578653297.tar.gz
git-9210c68d2af84d869f1635efe9a2092578653297.tar.bz2
Merge branch 'mt/checkout-remove-nofollow'
When "git checkout" removes a path that does not exist in the commit it is checking out, it wasn't careful enough not to follow symbolic links, which has been corrected. * mt/checkout-remove-nofollow: checkout: don't follow symlinks when removing entries symlinks: update comment on threaded_check_leading_path()
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 9af8e79..29029f3 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -2097,7 +2097,7 @@ static int verify_absent_1(const struct cache_entry *ce,
if (o->index_only || o->reset || !o->update)
return 0;
- len = check_leading_path(ce->name, ce_namelen(ce));
+ len = check_leading_path(ce->name, ce_namelen(ce), 0);
if (!len)
return 0;
else if (len > 0) {