X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fgit.git;a=blobdiff_plain;f=t%2Ft7105-reset-patch.sh;h=98b7d7b969e4eb3ded40aba1f12d2afc8bad849a;hp=95fab2036109c5a4aef8ff3d8100403fe335819f;hb=98e3d8faf9eebd382f62a75c886b7e1c6a20279b;hpb=ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh index 95fab20..98b7d7b 100755 --- a/t/t7105-reset-patch.sh +++ b/t/t7105-reset-patch.sh @@ -25,15 +25,17 @@ test_expect_success PERL 'saying "n" does nothing' ' ' test_expect_success PERL 'git reset -p' ' - (echo n; echo y) | git reset -p && + (echo n; echo y) | git reset -p >output && verify_state dir/foo work head && - verify_saved_state bar + verify_saved_state bar && + test_i18ngrep "Unstage" output ' test_expect_success PERL 'git reset -p HEAD^' ' - (echo n; echo y) | git reset -p HEAD^ && + (echo n; echo y) | git reset -p HEAD^ >output && verify_state dir/foo work parent && - verify_saved_state bar + verify_saved_state bar && + test_i18ngrep "Apply" output ' # The idea in the rest is that bar sorts first, so we always say 'y'