summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 15:50:04 +0100
committerJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 15:50:04 +0100
commit2d1142a3e8455af1bdab2cb19dfaf428cdc03459 (patch)
treeedf2da177d02dc723e12a7057e1e4906d0f8aa06 /unpack-trees.c
parentb3d7a52fac39193503a0b6728771d1bf6a161464 (diff)
parenta79fd20c7166f4040a82d257c893f52b0da6aeba (diff)
downloadgit-2d1142a3e8455af1bdab2cb19dfaf428cdc03459.tar.gz
Sync with 2.26.3
* maint-2.26: Git 2.26.3 Git 2.25.5 Git 2.24.4 Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 4be5fc3075..436598d210 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -417,6 +417,9 @@ static int check_updates(struct unpack_trees_options *o,
progress = get_progress(o, index);
+ /* Start with clean cache to avoid using any possibly outdated info. */
+ invalidate_lstat_cache();
+
git_attr_set_direction(GIT_ATTR_CHECKOUT);
if (should_update_submodules())