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 /builtin/add.c | |
| parent | 9d67b61f739a1a898bc8c9960047ebff0e9c9d09 (diff) | |
| download | git-512aaf9453cecfa57dddc61aec2132b936b2ff70.tar.gz git-512aaf9453cecfa57dddc61aec2132b936b2ff70.tar.xz | |
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>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/builtin/add.c b/builtin/add.c index f95ded256..3716617e2 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); } } |