diff options
| author | René Scharfe <l.s.r@web.de> | 2021-10-07 22:31:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-08 02:52:26 +0200 |
| commit | c8ad9d04c6a51cb5c73ebc9e42b627314eeafe2f (patch) | |
| tree | 8e664cc06c40a89b5b86c05c0eeabdcf49385f9d /t/t3905-stash-include-untracked.sh | |
| parent | read-cache: add verify_path_internal() (diff) | |
| download | git-c8ad9d04c6a51cb5c73ebc9e42b627314eeafe2f.tar.xz git-c8ad9d04c6a51cb5c73ebc9e42b627314eeafe2f.zip | |
read-cache: let verify_path() reject trailing dir separators again
6e773527b6 (sparse-index: convert from full to sparse, 2021-03-30) made
verify_path() accept trailing directory separators for directories,
which is necessary for sparse directory entries. This clemency causes
"git stash" to stumble over sub-repositories, though, and there may be
more unintended side-effects.
Avoid them by restoring the old verify_path() behavior and accepting
trailing directory separators only in places that are supposed to handle
sparse directory entries.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3905-stash-include-untracked.sh')
| -rwxr-xr-x | t/t3905-stash-include-untracked.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index f213c7327e..c59bcffabb 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -405,7 +405,7 @@ test_expect_success 'stash show --include-untracked errors on duplicate files' ' test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err ' -test_expect_failure 'stash -u ignores sub-repository' ' +test_expect_success 'stash -u ignores sub-repository' ' test_when_finished "rm -rf sub-repo" && git init sub-repo && git stash -u |