X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6001-rev-list-merge-order.sh;h=8ec9ebb98abf00d5b433e11b56efbd31bbce2c40;hb=f8348be3be8493a62110a09ab0343213990b416b;hp=a99644103d6917375111c2a104a2e1e9219d82b5;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh old mode 100644 new mode 100755 index a9964410..8ec9ebb9 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -6,118 +6,14 @@ test_description='Tests git-rev-list --merge-order functionality' . ./test-lib.sh +. ../t6000lib.sh # t6xxx specific functions -# -# TODO: move the following block (upto --- end ...) into testlib.sh -# -[ -d .git/refs/tags ] || mkdir -p .git/refs/tags - -sed_script=""; - -# Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags -tag() -{ - _tag=$1 - [ -f .git/refs/tags/$_tag ] || error "tag: \"$_tag\" does not exist" - cat .git/refs/tags/$_tag -} - -# Generate a commit using the text specified to make it unique and the tree -# named by the tag specified. -unique_commit() -{ - _text=$1 - _tree=$2 - shift 2 - echo $_text | git-commit-tree $(tag $_tree) "$@" -} - -# Save the output of a command into the tag specified. Prepend -# a substitution script for the tag onto the front of $sed_script -save_tag() -{ - _tag=$1 - [ -n "$_tag" ] || error "usage: save_tag tag commit-args ..." - shift 1 - "$@" >.git/refs/tags/$_tag - sed_script="s/$(tag $_tag)/$_tag/g${sed_script+;}$sed_script" -} - -# Replace unhelpful sha1 hashses with their symbolic equivalents -entag() -{ - sed "$sed_script" -} - -# Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL -# tag to a specified value. Restore the original value on return. -as_author() -{ - _author=$1 - shift 1 - _save=$GIT_AUTHOR_EMAIL - - export GIT_AUTHOR_EMAIL="$_author" - "$@" - export GIT_AUTHOR_EMAIL="$_save" -} - -commit_date() -{ - _commit=$1 - git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p" -} - -on_committer_date() -{ - _date=$1 - shift 1 - GIT_COMMITTER_DATE=$_date "$@" -} - -# Execute a command and suppress any error output. -hide_error() -{ - "$@" 2>/dev/null -} - -check_output() -{ - _name=$1 - shift 1 - if "$@" | entag > $_name.actual - then - diff $_name.expected $_name.actual - else - return 1; - fi - -} - -# Turn a reasonable test description into a reasonable test name. -# All alphanums translated into -'s which are then compressed and stripped -# from front and back. -name_from_description() -{ - tr "'" '-' | tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' | tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//" -} - - -# Execute the test described by the first argument, by eval'ing -# command line specified in the 2nd argument. Check the status code -# is zero and that the output matches the stream read from -# stdin. -test_output_expect_success() -{ - _description=$1 - _test=$2 - [ $# -eq 2 ] || error "usage: test_output_expect_success description test < $_name.expected - test_expect_success "$_description" "check_output $_name $_test" -} - -# --- end of stuff to move --- +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() @@ -149,7 +45,7 @@ grep_stderr() } date >path0 -git-update-cache --add path0 +git-update-index --add path0 save_tag tree git-write-tree on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root @@ -172,6 +68,13 @@ on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3 on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4 on_committer_date "1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3 on_committer_date "1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4 +on_committer_date "1971-08-16 00:00:21" hide_error save_tag alt_root unique_commit alt_root tree +on_committer_date "1971-08-16 00:00:22" save_tag r0 unique_commit r0 tree -p alt_root +on_committer_date "1971-08-16 00:00:23" save_tag r1 unique_commit r1 tree -p r0 +on_committer_date "1971-08-16 00:00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1 +on_committer_date "1971-08-16 00:00:25" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5 + + # # note: as of 20/6, it isn't possible to create duplicate parents, so this # can't be tested. @@ -205,16 +108,7 @@ save_tag h2 unique_commit g4 tree -p g2 save_tag g3 unique_commit g5 tree -p g2 save_tag g4 unique_commit g6 tree -p g3 -p h2 -tag l5 > .git/HEAD - -# -# cd to t/trash and use -# -# git-rev-list ... 2>&1 | sed "$(cat sed.script)" -# -# if you ever want to manually debug the operation of git-rev-list -# -echo $sed_script > sed.script +git-update-ref HEAD $(tag l5) test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <