On Tue, Jun 7, 2011 at 9:22 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Erik Faye-Lund <kusmabite@xxxxxxxxx> writes:
>
>> I forgot to ask; do you want me to resend? I would imagine the commit
>> message should be updated to reflect this change as well...
>
> Here is what I queued last night. If it looks Ok then I'll merge it down
> to 'next'.
>
> -- >8 --
> Subject: [PATCH] verify_path(): simplify check at the directory boundary
>
> We simply want to say "At a directory boundary, be careful with a name
> that begins with a dot, forbid a name that ends with the boundary
> character or has duplicated bounadry characters".
>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
> read-cache.c | 13 +++----------
> 1 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 31cf0b5..3593291 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -784,16 +784,9 @@ int verify_path(const char *path)
> if (is_dir_sep(c)) {
> inside:
> c = *path++;
> - switch (c) {
> - default:
> - continue;
> - case '/': case '\0':
> - break;
> - case '.':
> - if (verify_dotfile(path))
> - continue;
> - }
> - return 0;
> + if ((c == '.' && !verify_dotfile(path)) ||
> + is_dir_sep(c) || c == '\0')
> + return 0;
> }
> c = *path++;
> }
Looks good to me, thanks for following up on it :)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html