diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-12-16 23:46:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:04:45 -0800 |
| commit | 2b4c6efc82119ba8f4169717473d95d1a89e4c69 (patch) | |
| tree | f1e8635c0836f0fefa44ec9016d29acb98c7d57d /t/t1014-read-tree-confusing.sh | |
| parent | 1d1d69bc52dcc7def5b2edbd165cc0a4e3911c8e (diff) | |
| download | git-2b4c6efc82119ba8f4169717473d95d1a89e4c69.tar.gz | |
read-cache: optionally disallow NTFS .git variants
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>
Diffstat (limited to 't/t1014-read-tree-confusing.sh')
| -rwxr-xr-x | t/t1014-read-tree-confusing.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t1014-read-tree-confusing.sh b/t/t1014-read-tree-confusing.sh index ec310d5938..2f5a25d503 100755 --- a/t/t1014-read-tree-confusing.sh +++ b/t/t1014-read-tree-confusing.sh @@ -15,8 +15,17 @@ 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) && @@ -36,6 +45,10 @@ done <<-EOF ${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' ' |