From 5a76aff1a6f112cc2888b63ee97ade679e6e3e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sun, 14 Jul 2013 15:35:46 +0700 Subject: add: convert to use parse_pathspec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- pathspec.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'pathspec.c') diff --git a/pathspec.c b/pathspec.c index 5c9631a1a1..2774bda476 100644 --- a/pathspec.c +++ b/pathspec.c @@ -57,49 +57,6 @@ char *find_pathspecs_matching_against_index(const char **pathspec) return seen; } -/* - * Check the index to see whether path refers to a submodule, or - * something inside a submodule. If the former, returns the path with - * any trailing slash stripped. If the latter, dies with an error - * message. - */ -const char *check_path_for_gitlink(const char *path) -{ - int i, path_len = strlen(path); - for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - if (S_ISGITLINK(ce->ce_mode)) { - int ce_len = ce_namelen(ce); - if (path_len <= ce_len || path[ce_len] != '/' || - memcmp(ce->name, path, ce_len)) - /* path does not refer to this - * submodule or anything inside it */ - continue; - if (path_len == ce_len + 1) { - /* path refers to submodule; - * strip trailing slash */ - return xstrndup(ce->name, ce_len); - } else { - die (_("Path '%s' is in submodule '%.*s'"), - path, ce_len, ce->name); - } - } - } - return path; -} - -/* - * Dies if the given path refers to a file inside a symlinked - * directory in the index. - */ -void die_if_path_beyond_symlink(const char *path, const char *prefix) -{ - if (has_symlink_leading_path(path, strlen(path))) { - int len = prefix ? strlen(prefix) : 0; - die(_("'%s' is beyond a symbolic link"), path + len); - } -} - /* * Magic pathspec * -- cgit v1.2.1