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

Sync with 2.18.5

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

fb049fd85b298d386dca2e0bcf74a1f52a7b2038
diff --cc unpack-trees.c
index 705054a669,8c246a1db3..7e023daca3
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -352,8 -360,11 +352,11 @@@ 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, index);
 +		git_attr_set_direction(GIT_ATTR_CHECKOUT);
  
  	if (should_update_submodules() && o->update && !o->dry_run)
  		load_gitmodules_file(index, NULL);