diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
| commit | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (patch) | |
| tree | 9b6c265d69d1dc8bcce36c86a44674cfb010a6d7 /t/t6001-rev-list-merge-order.sh | |
| parent | 17dff84b5e745ba17a5b3ae5591d79f96b165d48 (diff) | |
| parent | c1fe2fe4fe685e0587c3949f953aab726de88994 (diff) | |
GIT 1.0.7v1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6001-rev-list-merge-order.sh')
| -rwxr-xr-x | t/t6001-rev-list-merge-order.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 368b8d9e02..7724e8a8c5 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -8,13 +8,6 @@ test_description='Tests git-rev-list --merge-order functionality' . ./test-lib.sh . ../t6000lib.sh # t6xxx specific functions -if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null -then - test_expect_success 'skipping merge-order test' : - test_done - exit -fi - # test-case specific test function check_adjacency() { @@ -114,6 +107,13 @@ test_output_expect_success 'rev-list has correct number of entries' 'git-rev-lis 19 EOF +if git-rev-list --merge-order HEAD 2>&1 | grep 'OpenSSL not linked' >/dev/null +then + test_expect_success 'skipping merge-order test' : + test_done + exit +fi + normal_adjacency_count=$(git-rev-list HEAD | check_adjacency | grep -c "\^" | tr -d ' ') merge_order_adjacency_count=$(git-rev-list --merge-order HEAD | check_adjacency | grep -c "\^" | tr -d ' ') test_expect_success '--merge-order produces as many or fewer discontinuities' '[ $merge_order_adjacency_count -le $normal_adjacency_count ]' |