diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-03-18 16:14:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 11:07:27 -0700 |
| commit | 5bd81c73156a623edc9dff42c26469732f49aa89 (patch) | |
| tree | 21f6759e75ad01fafb99b1f703598e7245117c30 | |
| parent | 848575d833ca0d9d47db372348576f3b98bd19b7 (diff) | |
| download | git-5bd81c73156a623edc9dff42c26469732f49aa89.tar.gz git-5bd81c73156a623edc9dff42c26469732f49aa89.tar.xz | |
push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'
When it is unclear which command from a test has failed, usual
practice these days is to debug by running the test again with "sh -x"
instead of relying on debugging 'echo' statements.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5516-fetch-push.sh | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 2f1255d46..0695d570f 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -22,10 +22,8 @@ mk_test () { ( for ref in "$@" do - git push testrepo $the_first_commit:refs/$ref || { - echo "Oops, push refs/$ref failure" - exit 1 - } + git push testrepo $the_first_commit:refs/$ref || + exit done && cd testrepo && for ref in "$@" @@ -328,13 +326,8 @@ test_expect_success 'push with weak ambiguity (2)' ' test_expect_success 'push with ambiguity' ' mk_test heads/frotz tags/frotz && - if git push testrepo master:frotz - then - echo "Oops, should have failed" - false - else - check_push_result $the_first_commit heads/frotz tags/frotz - fi + test_must_fail git push testrepo master:frotz && + check_push_result $the_first_commit heads/frotz tags/frotz ' |