summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-06 22:17:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-06 22:17:50 (GMT)
commita578ef9e63a2f53ada00beb9d75b23e68061b331 (patch)
tree71d6606b5fa50d175f30b1719a6fa0b5a8436b63
parentc4117fcb97dbf5bc59d9cff09e7e4c0425fe8c27 (diff)
parent224c7d70fa14ed44d8e7e3ce1e165e05b7b23725 (diff)
downloadgit-a578ef9e63a2f53ada00beb9d75b23e68061b331.zip
git-a578ef9e63a2f53ada00beb9d75b23e68061b331.tar.gz
git-a578ef9e63a2f53ada00beb9d75b23e68061b331.tar.bz2
Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
An earlier update to Git for Windows declared that a tree object is invalid if it has a path component with backslash in it, which was overly strict, which has been corrected. The only protection the Windows users need is to prevent such path (or any path that their filesystem cannot check out) from entering the index. * js/mingw-loosen-overstrict-tree-entry-checks: mingw: only test index entries for backslashes, not tree entries
-rw-r--r--read-cache.c5
-rwxr-xr-xt/t7415-submodule-names.sh7
-rw-r--r--tree-walk.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/read-cache.c b/read-cache.c
index ad0b48c..737916e 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1278,6 +1278,11 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
int new_only = option & ADD_CACHE_NEW_ONLY;
+#ifdef GIT_WINDOWS_NATIVE
+ if (protect_ntfs && strchr(ce->name, '\\'))
+ return error(_("filename in tree entry contains backslash: '%s'"), ce->name);
+#endif
+
if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
cache_tree_invalidate_path(istate, ce->name);
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
index 905a557..7ae0dc8 100755
--- a/t/t7415-submodule-names.sh
+++ b/t/t7415-submodule-names.sh
@@ -207,6 +207,9 @@ test_expect_success MINGW 'prevent git~1 squatting on Windows' '
git hash-object -w --stdin)" &&
rev="$(git rev-parse --verify HEAD)" &&
hash="$(echo x | git hash-object -w --stdin)" &&
+ test_must_fail git update-index --add \
+ --cacheinfo 160000,$rev,d\\a 2>err &&
+ test_i18ngrep backslash err &&
git -c core.protectNTFS=false update-index --add \
--cacheinfo 100644,$modules,.gitmodules \
--cacheinfo 160000,$rev,c \
@@ -214,9 +217,7 @@ test_expect_success MINGW 'prevent git~1 squatting on Windows' '
--cacheinfo 100644,$hash,d./a/x \
--cacheinfo 100644,$hash,d./a/..git &&
test_tick &&
- git -c core.protectNTFS=false commit -m "module" &&
- test_must_fail git show HEAD: 2>err &&
- test_i18ngrep backslash err
+ git -c core.protectNTFS=false commit -m "module"
) &&
test_must_fail git -c core.protectNTFS=false \
clone --recurse-submodules squatting squatting-clone 2>err &&
diff --git a/tree-walk.c b/tree-walk.c
index b3d1620..d5a8e09 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -43,12 +43,6 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
strbuf_addstr(err, _("empty filename in tree entry"));
return -1;
}
-#ifdef GIT_WINDOWS_NATIVE
- if (protect_ntfs && strchr(path, '\\')) {
- strbuf_addf(err, _("filename in tree entry contains backslash: '%s'"), path);
- return -1;
- }
-#endif
len = strlen(path) + 1;
/* Initialize the descriptor entry */