X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=update-index.c;h=956b6b34f99a447f55fe48ef3ce1eb652524c985;hb=1d84a60459a32fb1707ff7de4a013b5d9673f55d;hp=8def9bcd9fc05f205d278c3d8317f1af748f00d8;hpb=283c8eef6c9a4e379c73904d2bc22b19341b15c8;p=git.git diff --git a/update-index.c b/update-index.c index 8def9bcd..956b6b34 100644 --- a/update-index.c +++ b/update-index.c @@ -128,70 +128,6 @@ static int add_file_to_cache(const char *path) return 0; } -/* - * We fundamentally don't like some paths: we don't want - * dot or dot-dot anywhere, and for obvious reasons don't - * want to recurse into ".git" either. - * - * Also, we don't want double slashes or slashes at the - * end that can make pathnames ambiguous. - */ -static int verify_dotfile(const char *rest) -{ - /* - * The first character was '.', but that - * has already been discarded, we now test - * the rest. - */ - switch (*rest) { - /* "." is not allowed */ - case '\0': case '/': - return 0; - - /* - * ".git" followed by NUL or slash is bad. This - * shares the path end test with the ".." case. - */ - case 'g': - if (rest[1] != 'i') - break; - if (rest[2] != 't') - break; - rest += 2; - /* fallthrough */ - case '.': - if (rest[1] == '\0' || rest[1] == '/') - return 0; - } - return 1; -} - -static int verify_path(const char *path) -{ - char c; - - goto inside; - for (;;) { - if (!c) - return 1; - if (c == '/') { -inside: - c = *path++; - switch (c) { - default: - continue; - case '/': case '\0': - break; - case '.': - if (verify_dotfile(path)) - continue; - } - return 0; - } - c = *path++; - } -} - static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, const char *path, int stage) {