X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft7105-reset-patch.sh;h=95fab2036109c5a4aef8ff3d8100403fe335819f;hb=a48fcd836971d065b9bf16b8cd046fd1aff9b279;hp=c1f4fc3c6573b866497352ac9ed3f9e10d650992;hpb=0622f79d8e7e91efc5870afe0ce134e1cee9f9f0;p=git.git diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh index c1f4fc3c6..95fab2036 100755 --- a/t/t7105-reset-patch.sh +++ b/t/t7105-reset-patch.sh @@ -3,7 +3,7 @@ test_description='git reset --patch' . ./lib-patch-mode.sh -test_expect_success 'setup' ' +test_expect_success PERL 'setup' ' mkdir dir && echo parent > dir/foo && echo dummy > bar && @@ -17,20 +17,20 @@ test_expect_success 'setup' ' # note: bar sorts before foo, so the first 'n' is always to skip 'bar' -test_expect_success 'saying "n" does nothing' ' - set_and_save_state dir/foo work work +test_expect_success PERL 'saying "n" does nothing' ' + set_and_save_state dir/foo work work && (echo n; echo n) | git reset -p && verify_saved_state dir/foo && verify_saved_state bar ' -test_expect_success 'git reset -p' ' +test_expect_success PERL 'git reset -p' ' (echo n; echo y) | git reset -p && verify_state dir/foo work head && verify_saved_state bar ' -test_expect_success 'git reset -p HEAD^' ' +test_expect_success PERL 'git reset -p HEAD^' ' (echo n; echo y) | git reset -p HEAD^ && verify_state dir/foo work parent && verify_saved_state bar @@ -41,27 +41,27 @@ test_expect_success 'git reset -p HEAD^' ' # dir/foo. There's always an extra 'n' to reject edits to dir/foo in # the failure case (and thus get out of the loop). -test_expect_success 'git reset -p dir' ' - set_state dir/foo work work +test_expect_success PERL 'git reset -p dir' ' + set_state dir/foo work work && (echo y; echo n) | git reset -p dir && verify_state dir/foo work head && verify_saved_state bar ' -test_expect_success 'git reset -p -- foo (inside dir)' ' - set_state dir/foo work work +test_expect_success PERL 'git reset -p -- foo (inside dir)' ' + set_state dir/foo work work && (echo y; echo n) | (cd dir && git reset -p -- foo) && verify_state dir/foo work head && verify_saved_state bar ' -test_expect_success 'git reset -p HEAD^ -- dir' ' +test_expect_success PERL 'git reset -p HEAD^ -- dir' ' (echo y; echo n) | git reset -p HEAD^ -- dir && verify_state dir/foo work parent && verify_saved_state bar ' -test_expect_success 'none of this moved HEAD' ' +test_expect_success PERL 'none of this moved HEAD' ' verify_saved_head '