Pull request overview

This PR fixes Git.execute(..., kill_after_timeout=...) so timeouts are enforced even when output_stream is provided, aligning behavior with the documented intent and closing the gap described in #1762.

Changes:

• Start and manage the existing timeout watchdog during the output_stream execution path, keeping it active until the subprocess exits.
• Refactor timeout error construction into a helper used by both communicate() and output_stream paths.
• Add a regression test where the child closes stdout early and then sleeps, ensuring kill_after_timeout still triggers.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

git/cmd.py:1490

• communicate() starts the watchdog timer but only cancels it on the success path. If proc.communicate() raises (e.g., due to an I/O error), the timer remains scheduled and can later kill the process (or a reused PID) after execute() has already failed. Cancel the watchdog in a finally to ensure it is always cleaned up.

            def communicate() -> Tuple[AnyStr, AnyStr]:
                assert watchdog is not None
                assert kill_check is not None
                watchdog.start()
                out, err = proc.communicate()
                watchdog.cancel()
                if kill_check.is_set():
                    err = make_timeout_error()
                return out, err

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Thanks a lot, this circumstantially looks good to me.