On Wednesday, July 17, 2024 3:01 AM, Jeff King wrote: >On Sun, Jul 14, 2024 at 03:05:58AM -0400, Jeff King wrote: > >> With --retry I think we would not actually read stdin at all, so we >> could just remove the mention of /dev/zero entirely. But if we wanted >> to be sure it did not read and choke on any input provided, I think just: >> >> diff --git a/t/t4153-am-resume-override-opts.sh >> b/t/t4153-am-resume-override-opts.sh >> index a4d0c03ca6..76783bdd67 100755 >> --- a/t/t4153-am-resume-override-opts.sh >> +++ b/t/t4153-am-resume-override-opts.sh >> @@ -45,6 +45,7 @@ test_expect_success '--3way overrides --no-3way' ' >> >> # Applying side1 with am --3way will succeed due to the threeway-merge. >> # Applying side2 will fail as --3way does not apply to it. >> + echo garbage | >> test_must_fail git am --retry --3way && >> test_path_is_dir .git/rebase-apply && >> test side1 = "$(cat file2)" >> @@ -99,7 +100,8 @@ test_expect_success '--reject overrides --no-reject' ' >> test_path_is_dir .git/rebase-apply && >> test_path_is_missing file.rej && >> >> - test_must_fail git am --retry --reject </dev/zero && >> + echo garbage | >> + test_must_fail git am --retry --reject && >> test_path_is_dir .git/rebase-apply && >> test_path_is_file file.rej >> ' > >Looking at the history, the use of /dev/zero was not here to simulate garbage on >stdin. It really was just meant to be a descriptor which never ran out of input, as a >workaround for test_terminal. This is described in the commit mentioned below. > >So I think we should just do this, which can go on top of jk/am-retry. I still do not >think it is super-urgent, but given the simplicity of the fix is probably worth doing >for the upcoming v2.46, which exposes these tests to more platforms. Might not be urgent but without this we cannot pass this test on NonStop and I'm assuming other non-linux systems. Thanks, --Randall
