From: Junio C Hamano <gitster@pobox.com>
To: Barret Rhoden <brho@google.com>
Cc: "René Scharfe" <l.s.r@web.de>,
"Jean-Yves Avenard" <jyavenard@mozilla.com>,
git@vger.kernel.org
Subject: Re: Request for change 610e2b9240 reversal
Date: Tue, 10 Nov 2020 09:05:47 -0800 [thread overview]
Message-ID: <xmqq361h87mc.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <416a4e32-f813-cb7f-406d-30c5d48034b3@google.com> (Barret Rhoden's message of "Tue, 10 Nov 2020 08:33:53 -0500")
Barret Rhoden <brho@google.com> writes:
> On 11/10/20 6:38 AM, René Scharfe wrote:
> [snip]
>> Reported-by: Jean-Yves Avenard <jyavenard@mozilla.com>
>> Signed-off-by: René Scharfe <l.s.r@web.de>
>
> patch looks good to me.
>
> Reviewed-by: Barret Rhoden <brho@google.com>
>
> Thanks,
>
> Barret
Yes, I do recall that we discussed reverting half of that change and
then I forgot to follow through.
Thanks, all. Will queue.
>
>
>> ---
>> oidset.c | 5 +++--
>> t/t8013-blame-ignore-revs.sh | 4 ++--
>> 2 files changed, 5 insertions(+), 4 deletions(-)
>> diff --git a/oidset.c b/oidset.c
>> index 2d0ab76fb5..5aac633c1f 100644
>> --- a/oidset.c
>> +++ b/oidset.c
>> @@ -72,9 +72,10 @@ void oidset_parse_file_carefully(struct oidset *set, const char *path,
>> if (!sb.len)
>> continue;
>> - if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0' ||
>> - (fn && fn(&oid, cbdata)))
>> + if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
>> die("invalid object name: %s", sb.buf);
>> + if (fn && fn(&oid, cbdata))
>> + continue;
>> oidset_insert(set, &oid);
>> }
>> if (ferror(fp))
>> diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
>> index 24ae5018e8..b18633dee1 100755
>> --- a/t/t8013-blame-ignore-revs.sh
>> +++ b/t/t8013-blame-ignore-revs.sh
>> @@ -39,10 +39,10 @@ test_expect_success 'validate --ignore-rev' '
>> test_must_fail git blame --ignore-rev X^{tree} file
>> '
>> -# Ensure bogus --ignore-revs-file requests are caught
>> +# Ensure bogus --ignore-revs-file requests are silently accepted
>> test_expect_success 'validate --ignore-revs-file' '
>> git rev-parse X^{tree} >ignore_x &&
>> - test_must_fail git blame --ignore-revs-file ignore_x file
>> + git blame --ignore-revs-file ignore_x file
>> '
>> for I in X XT
>> --
>> 2.29.2
>>
prev parent reply other threads:[~2020-11-10 17:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 11:15 Request for change 610e2b9240 reversal Jean-Yves Avenard
2020-11-10 11:38 ` René Scharfe
2020-11-10 13:33 ` Barret Rhoden
2020-11-10 17:05 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq361h87mc.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=brho@google.com \
--cc=git@vger.kernel.org \
--cc=jyavenard@mozilla.com \
--cc=l.s.r@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).