From 9d67b61f739a1a898bc8c9960047ebff0e9c9d09 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Sun, 6 Jan 2013 16:58:10 +0000 Subject: add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse Extract the body of the for loop in treat_gitlinks() into a separate check_path_for_gitlink() function so that it can be reused elsewhere. This paves the way for a new check-ignore sub-command. Also document treat_gitlinks(). Signed-off-by: Adam Spiers Signed-off-by: Junio C Hamano --- pathspec.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'pathspec.c') diff --git a/pathspec.c b/pathspec.c index b73b15cbb3..02d3344460 100644 --- a/pathspec.c +++ b/pathspec.c @@ -56,3 +56,34 @@ char *find_pathspecs_matching_against_index(const char **pathspec) add_pathspec_matches_against_index(pathspec, seen, i); 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; +} -- cgit v1.2.1