From bc341c8b61f7f55920798f809a296f3e4dd84e39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Thu, 5 Sep 2013 10:40:38 +0700 Subject: [PATCH] pathspec: catch prepending :(prefix) on pathspec with short magic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit :(prefix) is in the long form. Suppose people pass :!foo with '!' being the short form of magic 'bar', the code will happily turn it to :(prefix..)!foo, which makes '!' part of the path and no longer a magic. The correct form must be ':(prefix..,bar)foo', but as so far we haven't had any magic in short form yet (*), the code to convert from short form to long one will be inactive anyway. Let's postpone it until a real short form magic appears. (*) The short form magic '/' is a special case and won't be caught by this die(), which is correct. When '/' magic is detected, prefixlen is set back to 0 and the whole "if (prefixlen..)" block is skipped. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- pathspec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pathspec.c b/pathspec.c index d9f4143222..62fde5060f 100644 --- a/pathspec.c +++ b/pathspec.c @@ -231,7 +231,9 @@ static unsigned prefix_pathspec(struct pathspec_item *item, const char *start = elt; if (prefixlen && !literal_global) { /* Preserve the actual prefix length of each pattern */ - if (long_magic_end) { + if (short_magic) + die("BUG: prefixing on short magic is not supported"); + else if (long_magic_end) { strbuf_add(&sb, start, long_magic_end - start); strbuf_addf(&sb, ",prefix:%d", prefixlen); start = long_magic_end; -- 2.11.4.GIT