Skip to content

Commit

Permalink
Merge branch 'jk/am-retry'
Browse files Browse the repository at this point in the history
Test fix as a follow-up to an already graduated topic.

* jk/am-retry:
  t4153: stop redirecting input from /dev/zero
  • Loading branch information
gitster committed Jul 18, 2024
2 parents d07b5d9 + 2a959ec commit 1aac20a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t4153-am-resume-override-opts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand Down

0 comments on commit 1aac20a

Please sign in to comment.