Skip to content

Commit

Permalink
t2016 (checkout -p): add missing &&
Browse files Browse the repository at this point in the history
Although the set_state command is not likely to fail, it is best to
stay in the habit of checking for failures.

Cc: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Sep 9, 2010
1 parent 8fe5aed commit a814615
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t2016-checkout-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test_expect_success PERL 'git checkout -p HEAD with NO staged changes: apply' '
'

test_expect_success PERL 'git checkout -p HEAD with change already staged' '
set_state dir/foo index index
set_state dir/foo index index &&
# the third n is to get out in case it mistakenly does not apply
(echo n; echo y; echo n) | git checkout -p HEAD &&
verify_saved_state bar &&
Expand Down

0 comments on commit a814615

Please sign in to comment.