mirror of
https://github.com/git/git.git
synced 2024-09-22 07:50:46 +02:00
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>
This commit is contained in:
parent
2a1ae649a4
commit
c8ad9d04c6
@ -854,7 +854,7 @@ static enum verify_path_result verify_path_internal(const char *, unsigned);
|
|||||||
|
|
||||||
int verify_path(const char *path, unsigned mode)
|
int verify_path(const char *path, unsigned mode)
|
||||||
{
|
{
|
||||||
return verify_path_internal(path, mode) != PATH_INVALID;
|
return verify_path_internal(path, mode) == PATH_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct cache_entry *make_cache_entry(struct index_state *istate,
|
struct cache_entry *make_cache_entry(struct index_state *istate,
|
||||||
@ -867,7 +867,7 @@ struct cache_entry *make_cache_entry(struct index_state *istate,
|
|||||||
struct cache_entry *ce, *ret;
|
struct cache_entry *ce, *ret;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
if (!verify_path(path, mode)) {
|
if (verify_path_internal(path, mode) == PATH_INVALID) {
|
||||||
error(_("invalid path '%s'"), path);
|
error(_("invalid path '%s'"), path);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -1356,7 +1356,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
|
|||||||
|
|
||||||
if (!ok_to_add)
|
if (!ok_to_add)
|
||||||
return -1;
|
return -1;
|
||||||
if (!verify_path(ce->name, ce->ce_mode))
|
if (verify_path_internal(ce->name, ce->ce_mode) == PATH_INVALID)
|
||||||
return error(_("invalid path '%s'"), ce->name);
|
return error(_("invalid path '%s'"), ce->name);
|
||||||
|
|
||||||
if (!skip_df_check &&
|
if (!skip_df_check &&
|
||||||
|
@ -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_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" &&
|
test_when_finished "rm -rf sub-repo" &&
|
||||||
git init sub-repo &&
|
git init sub-repo &&
|
||||||
git stash -u
|
git stash -u
|
||||||
|
Loading…
Reference in New Issue
Block a user