From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 12 Feb 2021 14:49:55 +0000 (+0100)
Subject: Sync with 2.24.4
X-Git-Tag: v2.25.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97d1dcb1efb2899a40b42da894f2ead0eb7af7ef;p=thirdparty%2Fgit.git

Sync with 2.24.4

* maint-2.24:
  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
---

97d1dcb1efb2899a40b42da894f2ead0eb7af7ef
diff --cc unpack-trees.c
index da4d6d4ec0,fa333289fc..9e527b4f7b
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -383,9 -377,13 +383,12 @@@ static int check_updates(struct unpack_
  
  	progress = get_progress(o);
  
+ 	/* Start with clean cache to avoid using any possibly outdated info. */
+ 	invalidate_lstat_cache();
+ 
 -	if (o->update)
 -		git_attr_set_direction(GIT_ATTR_CHECKOUT);
 +	git_attr_set_direction(GIT_ATTR_CHECKOUT);
  
 -	if (should_update_submodules() && o->update && !o->dry_run)
 +	if (should_update_submodules())
  		load_gitmodules_file(index, NULL);
  
  	for (i = 0; i < index->cache_nr; i++) {