From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: "René Scharfe" <l.s.r@web.de>,
"Git Mailing List" <git@vger.kernel.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH] upload-pack: remove superfluous sigchain_pop() call
Date: Tue, 11 Aug 2020 14:01:39 -0700 [thread overview]
Message-ID: <xmqqtux899sc.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200811182603.GB33504@syl.lan> (Taylor Blau's message of "Tue, 11 Aug 2020 14:26:03 -0400")
Taylor Blau <me@ttaylorr.com> writes:
> On Tue, Aug 11, 2020 at 07:15:03PM +0200, René Scharfe wrote:
>> 2997178ee6 (upload-pack: split check_unreachable() in two, prep for
>> get_reachable_list(), 2016-06-12) moved most code of has_unreachable()
>> into the new function do_reachable_revlist(). The latter takes care to
>> ignore SIGPIPE during its operations, and restores the original signal
>> handler before returning.
>>
>> However, a sigchain_pop(SIGPIPE) call remained in the error handling
>> code of has_unreachable(), which does nothing because the stack is
>> empty after do_reachable_revlist() cleaned up after itself. Remove it.
>
> Thanks for noticing. Your analysis seems correct to me after a quick
> inspection of the code, so this has my:
>
> Reviewed-by: Taylor Blau <me@ttaylorr.com>
>
>> Signed-off-by: René Scharfe <l.s.r@web.de>
>> ---
>> upload-pack.c | 1 -
>> 1 file changed, 1 deletion(-)
Yeah, looks good to me, too. Thanks, both.
>> diff --git a/upload-pack.c b/upload-pack.c
>> index d087113d23e..1b068da0d26 100644
>> --- a/upload-pack.c
>> +++ b/upload-pack.c
>> @@ -731,7 +731,6 @@ static int has_unreachable(struct object_array *src, enum allow_uor allow_uor)
>> return 0;
>>
>> error:
>> - sigchain_pop(SIGPIPE);
>> if (cmd.out >= 0)
>> close(cmd.out);
>> return 1;
>> --
>> 2.28.0
>
> Thanks,
> Taylor
prev parent reply other threads:[~2020-08-11 21:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 17:15 [PATCH] upload-pack: remove superfluous sigchain_pop() call René Scharfe
2020-08-11 18:26 ` Taylor Blau
2020-08-11 21:01 ` 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=xmqqtux899sc.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=me@ttaylorr.com \
--cc=pclouds@gmail.com \
/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).