On Thu, Jun 06, 2024 at 04:17:24AM -0400, Jeff King wrote: > This is an alternative to Rubén's patch here: > > https://lore.kernel.org/git/d95180fc-8f8a-4e1d-987d-3aa0811be7de@xxxxxxxxx/ > > and instead just rips out the stdin feature of test-terminal completely. I agree that this is a better approach. I have no problem building my other series on this. Thanks! > There are two tests in t4153 that rely on it (and for which it was > originally added), but I think the fact that we need to use > test_terminal there indicates missing functionality in git-am. > > So patch 1 fixes that, and then patch 2 simplifies test-terminal. > > [1/2]: am: add explicit "--retry" option > [2/2]: test-terminal: drop stdin handling > > Documentation/git-am.txt | 8 +++++++- > builtin/am.c | 3 +++ > t/t4153-am-resume-override-opts.sh | 14 +++++++++----- > t/test-terminal.perl | 29 +++-------------------------- > 4 files changed, 22 insertions(+), 32 deletions(-) > > -Peff It has been far less than ten, laps ;-)
