diff options
| author | Adam Spiers <git@adamspiers.org> | 2013-01-06 16:58:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 14:26:37 -0800 |
| commit | 512aaf9453cecfa57dddc61aec2132b936b2ff70 (patch) | |
| tree | 5b10c1da9594fb012bedf00ad2df9d26e4c831d0 | |
| parent | 9d67b61f739a1a898bc8c9960047ebff0e9c9d09 (diff) | |
| download | git-512aaf9453cecfa57dddc61aec2132b936b2ff70.tar.gz | |
add.c: extract new die_if_path_beyond_symlink() for reuse
This will be reused by a new git check-ignore command.
Also document validate_pathspec().
Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/add.c | 10 | ||||
| -rw-r--r-- | pathspec.c | 12 | ||||
| -rw-r--r-- | pathspec.h | 1 |
3 files changed, 19 insertions, 4 deletions
diff --git a/builtin/add.c b/builtin/add.c index f95ded2567..3716617e22 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -153,6 +153,11 @@ static void refresh(int verbose, const char **pathspec) free(seen); } +/* + * Normalizes argv relative to prefix, via get_pathspec(), and then + * runs die_if_path_beyond_symlink() on each path in the normalized + * list. + */ static const char **validate_pathspec(const char **argv, const char *prefix) { const char **pathspec = get_pathspec(prefix, argv); @@ -160,10 +165,7 @@ static const char **validate_pathspec(const char **argv, const char *prefix) if (pathspec) { const char **p; for (p = pathspec; *p; p++) { - if (has_symlink_leading_path(*p, strlen(*p))) { - int len = prefix ? strlen(prefix) : 0; - die(_("'%s' is beyond a symbolic link"), *p + len); - } + die_if_path_beyond_symlink(*p, prefix); } } diff --git a/pathspec.c b/pathspec.c index 02d3344460..284f3970a3 100644 --- a/pathspec.c +++ b/pathspec.c @@ -87,3 +87,15 @@ const char *check_path_for_gitlink(const char *path) } 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); + } +} diff --git a/pathspec.h b/pathspec.h index bf8eb9629a..db0184a1ac 100644 --- a/pathspec.h +++ b/pathspec.h @@ -4,5 +4,6 @@ extern char *find_pathspecs_matching_against_index(const char **pathspec); extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs); extern const char *check_path_for_gitlink(const char *path); +extern void die_if_path_beyond_symlink(const char *path, const char *prefix); #endif /* PATHSPEC_H */ |