Re: [PATCH 06/11] refs-internal.h: correct is_per_worktree_ref()
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Feb 14, 2017, 09:40 UTC
- Message-ID
- <CACsJy8D=qFQ2_62e4oO1pSBz4JfZV4Zcoai=Ghjw5DTaNxrwog@mail.gmail.com>
- In-Reply-To
- <CAGZ79kYkc-_=RiK1uJ+ndhQu=B8u=UDVusXZu-dYe7KnGNye3Q@mail.gmail.com>
On Tue, Feb 14, 2017 at 5:37 AM, Stefan Beller <sbeller@google.com> wrote:
Show 22 quoted lines
> On Mon, Feb 13, 2017 at 7:20 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
>> All refs outside refs/ directory is per-worktree, not just HEAD.
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>> ---
>> refs/refs-internal.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/refs/refs-internal.h b/refs/refs-internal.h
>> index f4aed49f5..69d02b6ba 100644
>> --- a/refs/refs-internal.h
>> +++ b/refs/refs-internal.h
>> @@ -653,7 +653,7 @@ const char *resolve_ref_recursively(struct ref_store *refs,
>>
>> static inline int is_per_worktree_ref(const char *refname)
>> {
>> - return !strcmp(refname, "HEAD") ||
>> + return !starts_with(refname, "refs/") ||
>> starts_with(refname, "refs/bisect/");
>
> you're loosing HEAD here? (assuming we get HEAD in
> short form here, as well as long form refs/HEAD)I don't understand. if refname is HEAD then both !strcmp(...) and !starts_with(refname, "refs/") return 1. If it's refs/HEAD, both return 0. In other words, there's no functional changes?
-- Duy