diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-01 21:41:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-01 21:41:44 +0900 |
| commit | 152cb0cdc3df641ee9d47d400058f424377dcaed (patch) | |
| tree | 43f4b6df9c572bd42013dc78aec3531721b67982 /t | |
| parent | Merge branch 'ab/push-example-in-doc' (diff) | |
| parent | test-lib-functions: make 'test_cmp_rev' more informative on failure (diff) | |
| download | tgif-152cb0cdc3df641ee9d47d400058f424377dcaed.tar.xz | |
Merge branch 'sg/test-cmp-rev'
Test framework update.
* sg/test-cmp-rev:
test-lib-functions: make 'test_cmp_rev' more informative on failure
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib-functions.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index b4e391526a..589d93d15b 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -854,9 +854,23 @@ test_must_be_empty () { # Tests that its two parameters refer to the same revision test_cmp_rev () { - git rev-parse --verify "$1" >expect.rev && - git rev-parse --verify "$2" >actual.rev && - test_cmp expect.rev actual.rev + if test $# != 2 + then + error "bug in the test script: test_cmp_rev requires two revisions, but got $#" + else + local r1 r2 + r1=$(git rev-parse --verify "$1") && + r2=$(git rev-parse --verify "$2") && + if test "$r1" != "$r2" + then + cat >&4 <<-EOF + error: two revisions point to different objects: + '$1': $r1 + '$2': $r2 + EOF + return 1 + fi + fi } # Print a sequence of integers in increasing order, either with |