]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with 2.24.4
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 12 Feb 2021 14:49:55 +0000 (15:49 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 12 Feb 2021 14:49:55 +0000 (15:49 +0100)
* 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

1  2 
cache.h
compat/mingw.c
git-compat-util.h
run-command.c
t/t0021-conversion.sh
unpack-trees.c

diff --cc cache.h
Simple merge
diff --cc compat/mingw.c
Simple merge
Simple merge
diff --cc run-command.c
Simple merge
Simple merge
diff --cc unpack-trees.c
index da4d6d4ec01d6ca96e9efb08e828e8694567cd9f,fa333289fc2a594cbe3005951c355c91a0dd2d90..9e527b4f7bf69e7493a3791c7cd9947d66d098c7
@@@ -383,9 -377,13 +383,12 @@@ static int check_updates(struct unpack_
  
        progress = get_progress(o);
  
 -      if (o->update)
 -              git_attr_set_direction(GIT_ATTR_CHECKOUT);
+       /* 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() && o->update && !o->dry_run)
 +      if (should_update_submodules())
                load_gitmodules_file(index, NULL);
  
        for (i = 0; i < index->cache_nr; i++) {