Re: [PATCH v3 3/6] refs: add ref_type function
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 29, 2015, 06:32 UTC
- Message-ID
- <CAPig+cSRsrmKPLshfn2vpwbk3PV9vJzmTndQT9AHfsVaMmMKug@mail.gmail.com>
- In-Reply-To
- <1438107144-24293-4-git-send-email-dturner@twopensource.com>
On Tue, Jul 28, 2015 at 2:12 PM, David Turner <dturner@twopensource.com> wrote:
Show 28 quoted lines
> Add a function ref_type, which categorizes refs as per-worktree,
> pseudoref, or normal ref.
>
> Later, we will use this in refs.c to treat pseudorefs specially.
> Alternate ref backends may use it to treat both pseudorefs and
> per-worktree refs differently.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> diff --git a/refs.c b/refs.c
> index 0b96ece..553ae8b 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -2848,6 +2848,35 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
> return 0;
> }
>
> +static int is_per_worktree_ref(const char *refname)
> +{
> + return !strcmp(refname, "HEAD");
> +}
> +
> +static int is_pseudoref_syntax(const char *refname)
> +{
> + const char *c;
> +
> + if (strchr(refname, '/'))
> + return 0;Isn't this redundant? Won't the below for-loop already return 0 if it encounters a slash?
> + for (c = refname; *c; ++c) {Style: c++
Show 15 quoted lines
> + if (!isupper(*c) && *c != '-' && *c != '_')
> + return 0;
> + }
> +
> + return 1;
> +}
> +
> +enum ref_type ref_type(const char *refname)
> +{
> + if (is_per_worktree_ref(refname))
> + return REF_TYPE_PER_WORKTREE;
> + if (is_pseudoref_syntax(refname))
> + return REF_TYPE_PSEUDOREF;
> + return REF_TYPE_NORMAL;
> +}