Re: [PATCH 3/4] t/lib-git-p4: silence output when killing p4d and its watchdog
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jun 2, 2026, 10:20 UTC
- Message-ID
- <ah6uZ6tdIh38X2uZ@pks.im>
- In-Reply-To
- <xmqqecipxp6g.fsf@gitster.g>
On Tue, Jun 02, 2026 at 06:32:55PM +0900, Junio C Hamano wrote:
Show 19 quoted lines
> Patrick Steinhardt <ps@pks.im> writes:
>
> > stop_p4d_and_watchdog () {
> > kill -9 $p4d_pid $watchdog_pid
> > + wait $p4d $watchdog_pid 2>/dev/null
> > }
>
> Shoudln't we be waiting on $p4d_pid (not $p4d)...
>
> > @@ -175,7 +176,7 @@ retry_until_success () {
> >
> > stop_and_cleanup_p4d () {
> > kill -9 $p4d_pid $watchdog_pid
> > - wait $p4d_pid
> > + wait $p4d_pid $watchdog_pid 2>/dev/null
> > rm -rf "$db" "$cli" "$pidfile"
> > }
>
> ... like we do here?Oh, good catch. The statement basically doesn't do anything, which isn't much of a problem because we really only care about silencing the error message when the watchdog is being terminated. Will fix.
Patrick