mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
2b4c6efc82
The point of disallowing ".git" in the index is that we
would never want to accidentally overwrite files in the
repository directory. But this means we need to respect the
filesystem's idea of when two paths are equal. The prior
commit added a helper to make such a comparison for NTFS
and FAT32; let's use it in verify_path().
We make this check optional for two reasons:
1. It restricts the set of allowable filenames, which is
unnecessary for people who are not on NTFS nor FAT32.
In practice this probably doesn't matter, though, as
the restricted names are rather obscure and almost
certainly would never come up in practice.
2. It has a minor performance penalty for every path we
insert into the index.
This patch ties the check to the core.protectNTFS config
option. Though this is expected to be most useful on Windows,
we allow it to be set everywhere, as NTFS may be mounted on
other platforms. The variable does default to on for Windows,
though.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.4 KiB
Bash
Executable file
62 lines
1.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='check that read-tree rejects confusing paths'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'create base tree' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m base &&
|
|
blob=$(git rev-parse HEAD:file) &&
|
|
tree=$(git rev-parse HEAD^{tree})
|
|
'
|
|
|
|
test_expect_success 'enable core.protectHFS for rejection tests' '
|
|
git config core.protectHFS true
|
|
'
|
|
|
|
test_expect_success 'enable core.protectNTFS for rejection tests' '
|
|
git config core.protectNTFS true
|
|
'
|
|
|
|
while read path pretty; do
|
|
: ${pretty:=$path}
|
|
case "$path" in
|
|
*SPACE)
|
|
path="${path%SPACE} "
|
|
;;
|
|
esac
|
|
test_expect_success "reject $pretty at end of path" '
|
|
printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
|
|
bogus=$(git mktree <tree) &&
|
|
test_must_fail git read-tree $bogus
|
|
'
|
|
|
|
test_expect_success "reject $pretty as subtree" '
|
|
printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
|
|
bogus=$(git mktree <tree) &&
|
|
test_must_fail git read-tree $bogus
|
|
'
|
|
done <<-EOF
|
|
.
|
|
..
|
|
.git
|
|
.GIT
|
|
${u200c}.Git {u200c}.Git
|
|
.gI${u200c}T .gI{u200c}T
|
|
.GiT${u200c} .GiT{u200c}
|
|
git~1
|
|
.git.SPACE .git.{space}
|
|
.\\\\.GIT\\\\foobar backslashes
|
|
.git\\\\foobar backslashes2
|
|
EOF
|
|
|
|
test_expect_success 'utf-8 paths allowed with core.protectHFS off' '
|
|
test_when_finished "git read-tree HEAD" &&
|
|
test_config core.protectHFS false &&
|
|
printf "100644 blob %s\t%s" "$blob" ".gi${u200c}t" >tree &&
|
|
ok=$(git mktree <tree) &&
|
|
git read-tree $ok
|
|
'
|
|
|
|
test_done
|