Merge branch 'jk/am-retry'

gitster · gitster · commit 1aac20a4b092 · 2024-07-18T08:30:27.000-07:00
Test fix as a follow-up to an already graduated topic.

* jk/am-retry:
  t4153: stop redirecting input from /dev/zero
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
@@ -99,7 +99,7 @@ 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 &&
+	test_must_fail git am --retry --reject &&
 	test_path_is_dir .git/rebase-apply &&
 	test_path_is_file file.rej
 '

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ test_expect_success '--reject overrides --no-reject' '`
`99`	`99`	`test_path_is_dir .git/rebase-apply &&`
`100`	`100`	`test_path_is_missing file.rej &&`
`101`	`101`
`102`		`- test_must_fail git am --retry --reject </dev/zero &&`
	`102`	`+ test_must_fail git am --retry --reject &&`
`103`	`103`	`test_path_is_dir .git/rebase-apply &&`
`104`	`104`	`test_path_is_file file.rej`
`105`	`105`	`'`