summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2014-12-10 21:28:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-17 19:04:45 (GMT)
commitd08c13b947335cc48ecc1a8453d97b7147c2d6d6 (patch)
tree9b255a31f3c3e0cfc1c7f98aa771523ae6f76b4d
parent2b4c6efc82119ba8f4169717473d95d1a89e4c69 (diff)
downloadgit-d08c13b947335cc48ecc1a8453d97b7147c2d6d6.zip
git-d08c13b947335cc48ecc1a8453d97b7147c2d6d6.tar.gz
git-d08c13b947335cc48ecc1a8453d97b7147c2d6d6.tar.bz2
fsck: complain about NTFS ".git" aliases in trees
Now that the index can block pathnames that can be mistaken to mean ".git" on NTFS and FAT32, it would be helpful for fsck to notice such problematic paths. This lets servers which use receive.fsckObjects block them before the damage spreads. Note that the fsck check is always on, even for systems without core.protectNTFS set. This is technically more restrictive than we need to be, as a set of users on ext4 could happily use these odd filenames without caring about NTFS. However, on balance, it's helpful for all servers to block these (because the paths can be used for mischief, and servers which bother to fsck would want to stop the spread whether they are on NTFS themselves or not), and hardly anybody will be affected (because the blocked names are variants of .git or git~1, meaning mischief is almost certainly what the tree author had in mind). Ideally these would be controlled by a separate "fsck.protectNTFS" flag. However, it would be much nicer to be able to enable/disable _any_ fsck flag individually, and any scheme we choose should match such a system. Given the likelihood of anybody using such a path in practice, it is not unreasonable to wait until such a system materializes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--fsck.c3
-rwxr-xr-xt/t1450-fsck.sh9
2 files changed, 9 insertions, 3 deletions
diff --git a/fsck.c b/fsck.c
index b49113b..0b76de6 100644
--- a/fsck.c
+++ b/fsck.c
@@ -176,7 +176,8 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func)
has_dot = 1;
if (!strcmp(name, ".."))
has_dotdot = 1;
- if (!strcasecmp(name, ".git") || is_hfs_dotgit(name))
+ if (!strcasecmp(name, ".git") || is_hfs_dotgit(name) ||
+ is_ntfs_dotgit(name))
has_dotgit = 1;
has_zero_pad |= *(char *)desc.buffer == '0';
update_tree_entry(&desc);
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 8158b98..6edd99a 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -251,10 +251,10 @@ while read name path pretty; do
tree=$(git rev-parse HEAD^{tree}) &&
value=$(eval "echo \$$type") &&
printf "$mode $type %s\t%s" "$value" "$path" >bad &&
- git mktree <bad &&
+ bad_tree=$(git mktree <bad) &&
git fsck 2>out &&
cat out &&
- grep "warning.*\\." out
+ grep "warning.*tree $bad_tree" out
)'
done <<-\EOF
100644 blob
@@ -266,6 +266,11 @@ dotdot ..
dotgit .git
dotgit-case .GIT
dotgit-unicode .gI${u200c}T .gI{u200c}T
+dotgit-case2 .Git
+git-tilde1 git~1
+dotgitdot .git.
+dot-backslash-case .\\\\.GIT\\\\foobar
+dotgit-case-backslash .git\\\\foobar
EOF
test_done