Re: [PATCH 07/45] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jun 10, 2013, 01:29 UTC
Message-ID: <CAPig+cQuDEa-zGWa5JkeFAksu6PkwEXzWY2sEP-+-MfEY+AV8Q@mail.gmail.com>
In-Reply-To: <1370759178-1709-8-git-send-email-pclouds@gmail.com>

On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:

Show 21 quoted lines

> diff --git a/pathspec.c b/pathspec.c
> index 89bdc7f..9e68321 100644
> --- a/pathspec.c
> +++ b/pathspec.c
> @@ -271,10 +271,20 @@ void parse_pathspec(struct pathspec *pathspec,
>         if (!entry && !prefix)
>                 return;
>
> +       if ((flags & PATHSPEC_PREFER_CWD) &&
> +           (flags & PATHSPEC_PREFER_FULL))
> +               die("BUG: PATHSPEC_PREFER_CWD and PATHSPEC_PREFER_FULL are incompatible");
> +
>         /* No arguments with prefix -> prefix pathspec */
>         if (!entry) {
>                 static const char *raw[2];
>
> +               if (flags & PATHSPEC_PREFER_FULL)
> +                       return;
> +
> +               if (!(flags & PATHSPEC_PREFER_CWD))
> +                       die("BUG: parse_pathspec cannot take no arguments in this case");

"in this case" is a bit nebulous. Perhaps:

    die("BUG: PATHSPEC_PREFER_CWD requires arguments");

Show 12 quoted lines

>                 pathspec->items = item = xmalloc(sizeof(*item));
>                 memset(item, 0, sizeof(*item));
>                 item->match = prefix;
> @@ -340,7 +350,8 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
>         struct pathspec ps;
>         parse_pathspec(&ps,
>                        PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP,
> -                      0, prefix, pathspec);
> +                      PATHSPEC_PREFER_CWD,
> +                      prefix, pathspec);
>         return ps.raw;
>  }