diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-18 08:30:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-18 08:30:27 -0700 |
| commit | 1aac20a4b0929a8490e77f3f9ab8ee12aad50ceb (patch) | |
| tree | 2a11328d1047e9342b99bb49510f05914adb5486 | |
| parent | d07b5d9ad590657e0225fe3ddcb761046c3304b0 (diff) | |
| parent | 2a959ec21a7c9d68df8b9ad69431059caf715de1 (diff) | |
| download | git-1aac20a4b0929a8490e77f3f9ab8ee12aad50ceb.tar.gz | |
Merge branch 'jk/am-retry'
Test fix as a follow-up to an already graduated topic.
* jk/am-retry:
t4153: stop redirecting input from /dev/zero
| -rwxr-xr-x | t/t4153-am-resume-override-opts.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh index a4d0c03ca6..dd6ad8f7a8 100755 --- 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 ' |