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

1  2 
cache.h
compat/mingw.c
git-compat-util.h
run-command.c
t/t0021-conversion.sh
t/t0021/rot13-filter.pl
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
index cd32a82da5c3bc4ac5b6c1748ef3368ad6f4ca70,007f2d78ea5b035a3c07b38b6fd5df5dee005273..7bb93768f34e2625d54246d26525a5a8a1cc4d26
@@@ -134,14 -147,10 +147,16 @@@ while (1) 
                        if ( $buffer eq "can-delay=1" ) {
                                if ( exists $DELAY{$pathname} and $DELAY{$pathname}{"requested"} == 0 ) {
                                        $DELAY{$pathname}{"requested"} = 1;
+                               } elsif ( !exists $DELAY{$pathname} and $always_delay ) {
+                                       $DELAY{$pathname} = { "requested" => 1, "count" => 1 };
                                }
 +                      } elsif ($buffer =~ /^(ref|treeish|blob)=/) {
 +                              print $debug " $buffer";
                        } else {
 +                              # In general, filters need to be graceful about
 +                              # new metadata, since it's documented that we
 +                              # can pass any key-value pairs, but for tests,
 +                              # let's be a little stricter.
                                die "Unknown message '$buffer'";
                        }
  
diff --cc unpack-trees.c
index 4be5fc3075410f4004b9d5fc1902eb84880dded5,207616c6793260206daab69bc846298dd2d38197..436598d2102a54b9ab48ecdba6c70751cfcddb7d
@@@ -415,8 -381,11 +415,11 @@@ static int check_updates(struct unpack_
        if (o->clone)
                setup_collided_checkout_detection(&state, index);
  
 -      progress = get_progress(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())