Re: [PATCH v14 03/10] refs: standardize output of refs_read_symbolic_ref

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri Nov 22, 2024 at 12:30, karthik nayak <karthik.188@xxxxxxxxx> wrote:
> "Bence Ferdinandy" <bence@xxxxxxxxxxxxxx> writes:
>
>> On Fri Nov 22, 2024 at 11:37, karthik nayak <karthik.188@xxxxxxxxx> wrote:
>>> Bence Ferdinandy <bence@xxxxxxxxxxxxxx> writes:
>>>
>>> [snip]
>>>
>>>> diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
>>>> index 38eb14d591..1809e3426a 100644
>>>> --- a/refs/reftable-backend.c
>>>> +++ b/refs/reftable-backend.c
>>>> @@ -830,10 +830,12 @@ static int reftable_be_read_symbolic_ref(struct ref_store *ref_store,
>>>>  		return ret;
>>>>
>>>>  	ret = reftable_stack_read_ref(stack, refname, &ref);
>>>> -	if (ret == 0 && ref.value_type == REFTABLE_REF_SYMREF)
>>>> +        if (ret)
>>>> +                ret = -1;
>>>> +        else if (ref.value_type == REFTABLE_REF_SYMREF)
>>>>  		strbuf_addstr(referent, ref.value.symref);
>>>> -	else
>>>> -		ret = -1;
>>>> +        else
>>>> +                ret = NOT_A_SYMREF;
>>>>
>>>
>>> I was building my series on top of this, and noticed whitespace issues
>>> here. A simple way to check your series is to run:
>>>
>>>   $ git log --check --pretty=format:"---% h% s"
>>
>> I ran this on v15 and it didn't produce any output.
>
> Did you already post v15? I only see v14

Not yet, but I'll be sending it in a pinch.

>
>> I read what --check is in
>> the manpages, although the format is a bit cryptic for me. What does that do
>> exactly?
>>
>
> It ensures that commits don't have conflict markers and that there are
> no trailing whitespaces and spaces followed by tabs by default.
>
> Also this is included in the CI checks (see ci/check-whitespace.sh), so
> if you use either GitLab or GitHub you should see these shown as errors
> on the CI. You'll have to raise a MR/PR to trigger the CI I believe.

I've been running the CI by pushing to a fork since Taylor first caught an
error I didn't see locally and it never flagged. Now that you mention it, I'll
also add log --check to my CI-s.

>
> On a sidenote, do you think we should modify the manpage? I found it
> comprehensible, but would be nice to clarify anything cryptic.

No, --check was quite clear, the `--pretty=format:"---% h% s"` part was what
was cryptic.

>
>> Anyhow if there was no output for v15 I should be fine, right?
>>
>
> At the least you should see `git log`'s output, but if there are issues
> they should be shown inline. So when you say 'no output' do you mean you
> see absolutely no output?

Absolutely no output:
	https://asciinema.org/a/lsqp4e1bNst6cFWw9M2jX1IqC

But I figured out why: the whitespace and the tabs were not mixed on the line,
just across lines. As I read it, that is not an error to have tabs on one line
and spaces on the next.

Anyhow that should be now cleared up, thanks. Gotta say, I was expecting to
learn about internals doing this, but I also ended up picking up a couple of
usage things as well, like --range-diff for format patch and such.

Thanks,
Bence





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux