Revert "t/lib-git-daemon: record daemon log"

diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh
index 9891e2c1f5e5da357df795ee05969fbde72887ba..bd10a96727c573bdd53b53079943990d232431c3 100755 (executable)
--- a/t/t7105-reset-patch.sh
+++ b/t/t7105-reset-patch.sh
@@ -18,22 +18,24 @@ test_expect_success PERL 'setup' '
 # note: bar sorts before foo, so the first 'n' is always to skip 'bar'
 
 test_expect_success PERL 'saying "n" does nothing' '
-       set_and_save_state dir/foo work work
-       (echo n; echo n) | git reset -p &&
+       set_and_save_state dir/foo work work &&
+       test_write_lines n n | git reset -p &&
        verify_saved_state dir/foo &&
        verify_saved_state bar
 '
 
 test_expect_success PERL 'git reset -p' '
-       (echo n; echo y) | git reset -p &&
+       test_write_lines n 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^ &&
+       test_write_lines n 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'
@@ -42,21 +44,21 @@ test_expect_success PERL 'git reset -p HEAD^' '
 # the failure case (and thus get out of the loop).
 
 test_expect_success PERL 'git reset -p dir' '
-       set_state dir/foo work work
-       (echo y; echo n) | git reset -p dir &&
+       set_state dir/foo work work &&
+       test_write_lines y n | git reset -p dir &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 
 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) &&
+       set_state dir/foo work work &&
+       test_write_lines y n | (cd dir && git reset -p -- foo) &&
        verify_state dir/foo work head &&
        verify_saved_state bar
 '
 
 test_expect_success PERL 'git reset -p HEAD^ -- dir' '
-       (echo y; echo n) | git reset -p HEAD^ -- dir &&
+       test_write_lines y n | git reset -p HEAD^ -- dir &&
        verify_state dir/foo work parent &&
        verify_saved_state bar
 '