Skip to content

Commit

Permalink
t/t7105-reset-patch.sh: Add a PERL prerequisite
Browse files Browse the repository at this point in the history
Change this test to declare a PERL prerequisite. These tests use the
-p switch, so they implicitly depend on Perl code, but nothing was
declaring this.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ævar Arnfjörð Bjarmason authored and Junio C Hamano committed Aug 18, 2010
1 parent f944414 commit d2b263c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions t/t7105-reset-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand All @@ -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' '
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
Expand Down

0 comments on commit d2b263c

Please sign in to comment.