diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-09-05 10:40:38 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-09-05 12:25:19 -0700 |
| commit | bc341c8b61f7f55920798f809a296f3e4dd84e39 (patch) | |
| tree | 04d28fff4d57fc80879336c3a285acceba881772 /pathspec.c | |
| parent | rm: do not set a variable twice without intermediate reading. (diff) | |
| download | tgif-bc341c8b61f7f55920798f809a296f3e4dd84e39.tar.xz | |
pathspec: catch prepending :(prefix) on pathspec with short magic
:(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 <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pathspec.c')
| -rw-r--r-- | pathspec.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |