| commit | cae3aa79aaa62f414c38a44b3073767b1def3a6b | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 31 Oct 2010 07:34:44 +0000 (31 02:34 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Nov 2010 22:48:06 +0000 (9 14:48 -0800) | ||
| tree | 84fbaa5b9e9f6cbf8a2907bf26026b0e329af581 | treesnapshot (tar.gz zip) |
| parent | fb3340a6a7a956debcac92cd21cbcaea0928048e | commitdiff |
t6022 (renaming merge): chain test commands with &&
Using 'return' in an attempt to end a test assertion can have
unpredictable results (probably escaping from test_run_ and breaking
its bookkeeping). Redo the control flow using helpers like
test_expect_code and git diff --exit-code, so each test assertion can
follow the usual form
command that should succeed &&
command that should succeed &&
command that should succeed &&
...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Using 'return' in an attempt to end a test assertion can have
unpredictable results (probably escaping from test_run_ and breaking
its bookkeeping). Redo the control flow using helpers like
test_expect_code and git diff --exit-code, so each test assertion can
follow the usual form
command that should succeed &&
command that should succeed &&
command that should succeed &&
...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6022-merge-rename.sh | diffblobblamehistory |