зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/maint-rmdir-fix' into maint
* jk/maint-rmdir-fix: rm: fix bug in recursive subdirectory removal
This commit is contained in:
Коммит
7c0be4da5c
2
dir.c
2
dir.c
|
@ -1044,7 +1044,7 @@ int remove_path(const char *name)
|
|||
slash = dirs + (slash - name);
|
||||
do {
|
||||
*slash = '\0';
|
||||
} while (rmdir(dirs) && (slash = strrchr(dirs, '/')));
|
||||
} while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
|
||||
free(dirs);
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -271,4 +271,12 @@ test_expect_success 'choking "git rm" should not let it die with cruft' '
|
|||
test "$status" != 0
|
||||
'
|
||||
|
||||
test_expect_success 'rm removes subdirectories recursively' '
|
||||
mkdir -p dir/subdir/subsubdir &&
|
||||
echo content >dir/subdir/subsubdir/file &&
|
||||
git add dir/subdir/subsubdir/file &&
|
||||
git rm -f dir/subdir/subsubdir/file &&
|
||||
! test -d dir
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче