git checkout fails when recovering a deleted directory #1442

orgads · 2018-01-21T10:39:32Z

If I delete a directory, then try to recover it using git checkout, it fails.

Running git checkout -f without providing the directory name works.

I was not able to find an open or closed issue matching what I'm seeing

Setup

Which version of Git for Windows are you using? Is it 32-bit or 64-bit?

$ git --version --build-options

git version 2.16.0.windows.2
cpu: x86_64
built from commit: a56c4f9e2a9513d2be57dc4346e0e84887399cd9
sizeof-long: 4

Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

$ cmd.exe /c ver

Microsoft Windows [Version 6.1.7601]

What options did you set as part of the installation? Or did you choose the
defaults?

# One of the following:
> type "C:\Program Files\Git\etc\install-options.txt"
> type "C:\Program Files (x86)\Git\etc\install-options.txt"
> type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
$ cat /etc/install-options.txt

Editor Option: VIM
Path Option: Cmd
SSH Option: OpenSSH
CURL Option: WinSSL
CRLF Option: CRLFAlways
Bash Terminal Option: MinTTY
Performance Tweaks FSCache: Enabled
Use Credential Manager: Enabled
Enable Symlinks: Enabled

Any other interesting things about your environment that might be related
to the issue you're seeing?

** insert your response here **

Details

Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

Bash

What commands did you run to trigger this issue? If you can provide a
Minimal, Complete, and Verifiable example
this will help us understand the issue.

orgads@isr020134037 MINGW64 /f/git-sdk-64/usr/src/git ((v2.16.0.windows.2))
$ rm -rf t
git
orgads@isr020134037 MINGW64 /f/git-sdk-64/usr/src/git ((v2.16.0.windows.2))
$ git checkout -f t
Unlink of file 't' failed. Should I try again? (y/n) n
warning: unable to unlink 't': Directory not empty
fatal: cannot create directory at 't': Directory not empty

orgads@isr020134037 MINGW64 /f/git-sdk-64/usr/src/git ((v2.16.0.windows.2))
$ git checkout -f -- t
error: unable to stat just-written file t/.gitignore: No such file or directory
Unlink of file 't/Git-SVN' failed. Should I try again? (y/n) n
warning: unable to unlink 't/Git-SVN': Directory not empty
fatal: cannot create directory at 't/Git-SVN': Directory not empty

orgads@isr020134037 MINGW64 /f/git-sdk-64/usr/src/git ((v2.16.0.windows.2))
$ git checkout -f -- t
Unlink of file 't/Git-SVN/Utils' failed. Should I try again? (y/n) n
warning: unable to unlink 't/Git-SVN/Utils': Directory not empty
fatal: cannot create directory at 't/Git-SVN/Utils': Directory not empty

orgads@isr020134037 MINGW64 /f/git-sdk-64/usr/src/git ((v2.16.0.windows.2))
$ git checkout -f -- t
error: unable to stat just-written file t/Git-SVN/Utils/can_compress.t: No such file or directory
error: unable to stat just-written file t/Git-SVN/Utils/canonicalize_url.t: No such file or directory
error: unable to stat just-written file t/Git-SVN/Utils/collapse_dotdot.t: No such file or directory
error: unable to stat just-written file t/Git-SVN/Utils/fatal.t: No such file or directory
error: unable to stat just-written file t/Git-SVN/Utils/join_paths.t: No such file or directory
error: unable to stat just-written file t/Makefile: No such file or directory
error: unable to stat just-written file t/README: No such file or directory
error: unable to stat just-written file t/aggregate-results.sh: No such file or directory
error: unable to stat just-written file t/annotate-tests.sh: No such file or directory
error: unable to stat just-written file t/check-non-portable-shell.pl: No such file or directory
error: unable to stat just-written file t/diff-lib.sh: No such file or directory
Unlink of file 't/diff-lib' failed. Should I try again? (y/n) n
warning: unable to unlink 't/diff-lib': Directory not empty
fatal: cannot create directory at 't/diff-lib': Directory not empty

If the problem was occurring with a specific repository, can you provide the
URL to that repository to help us with testing?

https://github.com/git-for-windows/git

The text was updated successfully, but these errors were encountered:

This is fix for git-for-windows#1438, git-for-windows#1442 This patch introduces explicitly enabled fscache_lstat and fix the issue stat unintendedly returned from cache. I replace lstat with fscache_lstat in check_path called for every file in a repository. When we run `git checkout`, following two conditions are hold. * check_path is only called to get stat of file in working tree before checked out. * check_path is not called for the file after it is checked out. So cached stat when directory traversing does not affect returned value in check_path here. Signed-off-by: Takuto Ikuta <tikuta@chromium.org>

A set of regressions introduced by patches intended to speed up `reset` and `checkout` was fixed (issues [#1437](git-for-windows/git#1437), [#1438](git-for-windows/git#1438), [#1440](git-for-windows/git#1440) and [#1442](git-for-windows/git#1442). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

The recently introduced speedup of `git checkout` sadly introduced a regression: after writing a file, the cached stat data is obviously incorrect, yet we still used it! This patch simply reverts the original speedup (as opposed to try to hotfix it as #1443 tries to do), and marks it as a fixup commit so that the next merging-rebase will drop the patch. We will most likely want to speed up this code path, though, but may find a better way, e.g. by invalidating the cached data cleverly. (This will be a *little* tricky, though, as readdir() uses the data, and we must ensure that we do not pull it under readdir()'s rag when invalidating it, and we also must avoid re-caching for every written file, as that would be *even* slower than fscache=false.) This fixes #1438 and #1442 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

This is retry of git-for-windows#1419. I added flush_fscache macro to flush cached stats after disk writing with tests for regression reported in git-for-windows#1438 and git-for-windows#1442. git checkout checks each file path in sorted order, so cache flushing does not make performance worse unless we have large number of modified files in a directory containing many files. Using chromium repository, I tested `git checkout .` performance when I delete 10 files in different directories. With this patch: TotalSeconds: 4.307272 TotalSeconds: 4.4863595 TotalSeconds: 4.2975562 Avg: 4.36372923333333 Without this patch: TotalSeconds: 20.9705431 TotalSeconds: 22.4867685 TotalSeconds: 18.8968292 Avg: 20.7847136 I confirmed this patch passed all tests in t/ with core_fscache=1. Signed-off-by: Takuto Ikuta <tikuta@chromium.org>

This is retry of #1419. I added flush_fscache macro to flush cached stats after disk writing with tests for regression reported in #1438 and #1442. git checkout checks each file path in sorted order, so cache flushing does not make performance worse unless we have large number of modified files in a directory containing many files. Using chromium repository, I tested `git checkout .` performance when I delete 10 files in different directories. With this patch: TotalSeconds: 4.307272 TotalSeconds: 4.4863595 TotalSeconds: 4.2975562 Avg: 4.36372923333333 Without this patch: TotalSeconds: 20.9705431 TotalSeconds: 22.4867685 TotalSeconds: 18.8968292 Avg: 20.7847136 I confirmed this patch passed all tests in t/ with core_fscache=1. Signed-off-by: Takuto Ikuta <tikuta@chromium.org>

This is retry of git-for-windows#1419. I added flush_fscache macro to flush cached stats after disk writing with tests for regression reported in git-for-windows#1438 and git-for-windows#1442. git checkout checks each file path in sorted order, so cache flushing does not make performance worse unless we have large number of modified files in a directory containing many files. Using chromium repository, I tested `git checkout .` performance when I delete 10 files in different directories. With this patch: TotalSeconds: 4.307272 TotalSeconds: 4.4863595 TotalSeconds: 4.2975562 Avg: 4.36372923333333 Without this patch: TotalSeconds: 20.9705431 TotalSeconds: 22.4867685 TotalSeconds: 18.8968292 Avg: 20.7847136 I confirmed this patch passed all tests in t/ with core_fscache=1. Signed-off-by: Takuto Ikuta <tikuta@chromium.org>

This is retry of #1419. I added flush_fscache macro to flush cached stats after disk writing with tests for regression reported in #1438 and #1442. git checkout checks each file path in sorted order, so cache flushing does not make performance worse unless we have large number of modified files in a directory containing many files. Using chromium repository, I tested `git checkout .` performance when I delete 10 files in different directories. With this patch: TotalSeconds: 4.307272 TotalSeconds: 4.4863595 TotalSeconds: 4.2975562 Avg: 4.36372923333333 Without this patch: TotalSeconds: 20.9705431 TotalSeconds: 22.4867685 TotalSeconds: 18.8968292 Avg: 20.7847136 I confirmed this patch passed all tests in t/ with core_fscache=1. Signed-off-by: Takuto Ikuta <tikuta@chromium.org>

orgads mentioned this issue Jan 21, 2018

git status reports changes after git checkout -- . #1438

Closed

1 task

atetubou mentioned this issue Jan 21, 2018

checkout.c: use fscache stat only in usable place #1443

Closed

csware mentioned this issue Jan 21, 2018

Revert "reset.c: enable fscache" #1445

Closed

csmager mentioned this issue Jan 22, 2018

Error when stashing deletions #1435

Closed

1 task

dscho added this to the v2.16.0(3) milestone Jan 22, 2018

dscho closed this as completed Jan 22, 2018

atetubou mentioned this issue Jan 30, 2018

checkout.c: enable fscache for checkout again #1468

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

git checkout fails when recovering a deleted directory #1442

git checkout fails when recovering a deleted directory #1442

orgads commented Jan 21, 2018

git checkout fails when recovering a deleted directory #1442

git checkout fails when recovering a deleted directory #1442

Comments

orgads commented Jan 21, 2018

Setup

Details