diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-09-07 03:22:53 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 16:02:47 -0700 |
| commit | a814615a6a1722839c69dcc998ed4fae9da08310 (patch) | |
| tree | 9c3eec9c02d513b7a673ab32f73c32fbf14945c8 | |
| parent | 8fe5aeddcbeb194ea0f6e23e1f7b4ac38809921b (diff) | |
| download | git-a814615a6a1722839c69dcc998ed4fae9da08310.tar.gz | |
t2016 (checkout -p): add missing &&
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>
| -rwxr-xr-x | t/t2016-checkout-patch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh index 7657ec190c..a463b13b27 100755 --- a/t/t2016-checkout-patch.sh +++ b/t/t2016-checkout-patch.sh @@ -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 && |