Re: [PATCH v3 17/19] pathspec.c: extract new validate_path() for reuse

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 28, 2012, 20:44 UTC
Message-ID: <7v38ypj490.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1356575558-2674-18-git-send-email-git@adamspiers.org>

Adam Spiers <git@adamspiers.org> writes:

Show 20 quoted lines

> This will be reused by a new git check-ignore command.
>
> Signed-off-by: Adam Spiers <git@adamspiers.org>
> ---
>  pathspec.c | 20 ++++++++++++++------
>  pathspec.h |  1 +
>  2 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/pathspec.c b/pathspec.c
> index 8aea0d2..6724121 100644
> --- a/pathspec.c
> +++ b/pathspec.c
> @@ -77,9 +77,20 @@ void treat_gitlinks(const char **pathspec)
>  }
>  
>  /*
> + * Dies if the given path refers to a file inside a symlinked
> + * directory.
> + */
> +void validate_path(const char *path, const char *prefix)

The name needs to be a lot more specific.

There may be 47 different kinds of "validations" various callers may want to do on a path, but this function only caters to one kind of callers that want to make sure that the path refers to something that we would directly add to our index.

Show 6 quoted lines

> +{
> +	if (has_symlink_leading_path(path, strlen(path))) {
> +		int len = prefix ? strlen(prefix) : 0;
> +		die(_("'%s' is beyond a symbolic link"), path + len);
> +	}
> +}