mirror of
https://github.com/git-for-windows/git.git
synced 2026-03-27 19:20:21 -05:00
rmdir: align behavior on Windows when called on symlinks
When performing a rebase, rmdir() is called on the folder .git/logs. On Unix rmdir() exits without deleting anything in case .git/logs is a symbolic link but the equivalent functions on Windows (_rmdir, _wrmdir and RemoveDirectoryW) do not behave the same and remove the folder if it is symlink even if it is not empty. It generates issues when folders in .git/ are symlinks which is especially the case when git-repo[1] is used. This commit updates mingw_rmdir() so that its behavior is the same as Linux rmdir() in case of symbolic links. [1]: git-repo is a python tool built on top of Git which helps manage many Git repositories. It stores all the .git/ folders in a central place by taking advantage of symbolic links. More information: https://gerrit.googlesource.com/git-repo/ Signed-off-by: Thomas Bétous <tomspycell@gmail.com>
This commit is contained in:
committed by
Johannes Schindelin
parent
7d7673478c
commit
2ceeffd4ec
@@ -555,10 +555,25 @@ static int is_dir_empty(const wchar_t *wpath)
|
||||
int mingw_rmdir(const char *pathname)
|
||||
{
|
||||
int tries = 0;
|
||||
struct stat sb;
|
||||
|
||||
wchar_t wpathname[MAX_LONG_PATH];
|
||||
if (xutftowcs_long_path(wpathname, pathname) < 0)
|
||||
return -1;
|
||||
|
||||
/*
|
||||
* Contrary to Linux rmdir(), Windows' _wrmdir() and _rmdir()
|
||||
* will remove the directory at the path if it is a symbolic link
|
||||
* which leads to issues when symlinks are used in the .git folder
|
||||
* (in the context of git-repo for instance). So before calling _wrmdir()
|
||||
* we first check if the path is a symbolic link. If it is, we exit
|
||||
* and return the same error as Linux rmdir() in this case (ENOTDIR).
|
||||
*/
|
||||
if (!mingw_lstat(pathname, &sb) && S_ISLNK(sb.st_mode)) {
|
||||
errno = ENOTDIR;
|
||||
return -1;
|
||||
}
|
||||
|
||||
do {
|
||||
if (!_wrmdir(wpathname)) {
|
||||
invalidate_lstat_cache();
|
||||
|
||||
@@ -406,4 +406,14 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' '
|
||||
test_i18ngrep "already checked out" err
|
||||
'
|
||||
|
||||
test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' '
|
||||
git checkout main &&
|
||||
mv .git/logs actual_logs &&
|
||||
cmd //c "mklink /D .git\logs ..\actual_logs" &&
|
||||
git rebase -f HEAD^ &&
|
||||
test -L .git/logs &&
|
||||
rm .git/logs &&
|
||||
mv actual_logs .git/logs
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@@ -1568,6 +1568,12 @@ test_lazy_prereq SYMLINKS '
|
||||
ln -s x y && test -h y
|
||||
'
|
||||
|
||||
test_lazy_prereq SYMLINKS_WINDOWS '
|
||||
# test whether symbolic links are enabled on Windows
|
||||
test_have_prereq MINGW &&
|
||||
cmd //c "mklink y x" &> /dev/null && test -h y
|
||||
'
|
||||
|
||||
test_lazy_prereq FILEMODE '
|
||||
test "$(git config --bool core.filemode)" = true
|
||||
'
|
||||
|
||||
Reference in New Issue
Block a user