t / t6120-describe.shon commit Merge branch 'sb/http-flaky-test-fix' (c92df72)
   1#!/bin/sh
   2
   3test_description='test describe
   4
   5                       B
   6        .--------------o----o----o----x
   7       /                   /    /
   8 o----o----o----o----o----.    /
   9       \        A    c        /
  10        .------------o---o---o
  11                   D,R   e
  12'
  13. ./test-lib.sh
  14
  15check_describe () {
  16        expect="$1"
  17        shift
  18        R=$(git describe "$@" 2>err.actual)
  19        S=$?
  20        cat err.actual >&3
  21        test_expect_success "describe $*" '
  22        test $S = 0 &&
  23        case "$R" in
  24        $expect)        echo happy ;;
  25        *)      echo "Oops - $R is not $expect";
  26                false ;;
  27        esac
  28        '
  29}
  30
  31test_expect_success setup '
  32
  33        test_tick &&
  34        echo one >file && git add file && git commit -m initial &&
  35        one=$(git rev-parse HEAD) &&
  36
  37        git describe --always HEAD &&
  38
  39        test_tick &&
  40        echo two >file && git add file && git commit -m second &&
  41        two=$(git rev-parse HEAD) &&
  42
  43        test_tick &&
  44        echo three >file && git add file && git commit -m third &&
  45
  46        test_tick &&
  47        echo A >file && git add file && git commit -m A &&
  48        test_tick &&
  49        git tag -a -m A A &&
  50
  51        test_tick &&
  52        echo c >file && git add file && git commit -m c &&
  53        test_tick &&
  54        git tag c &&
  55
  56        git reset --hard $two &&
  57        test_tick &&
  58        echo B >side && git add side && git commit -m B &&
  59        test_tick &&
  60        git tag -a -m B B &&
  61
  62        test_tick &&
  63        git merge -m Merged c &&
  64        merged=$(git rev-parse HEAD) &&
  65
  66        git reset --hard $two &&
  67        test_tick &&
  68        echo D >another && git add another && git commit -m D &&
  69        test_tick &&
  70        git tag -a -m D D &&
  71        test_tick &&
  72        git tag -a -m R R &&
  73
  74        test_tick &&
  75        echo DD >another && git commit -a -m another &&
  76
  77        test_tick &&
  78        git tag e &&
  79
  80        test_tick &&
  81        echo DDD >another && git commit -a -m "yet another" &&
  82
  83        test_tick &&
  84        git merge -m Merged $merged &&
  85
  86        test_tick &&
  87        echo X >file && echo X >side && git add file side &&
  88        git commit -m x
  89
  90'
  91
  92check_describe A-* HEAD
  93check_describe A-* HEAD^
  94check_describe R-* HEAD^^
  95check_describe A-* HEAD^^2
  96check_describe B HEAD^^2^
  97check_describe R-* HEAD^^^
  98
  99check_describe c-* --tags HEAD
 100check_describe c-* --tags HEAD^
 101check_describe e-* --tags HEAD^^
 102check_describe c-* --tags HEAD^^2
 103check_describe B --tags HEAD^^2^
 104check_describe e --tags HEAD^^^
 105
 106check_describe heads/master --all HEAD
 107check_describe tags/c-* --all HEAD^
 108check_describe tags/e --all HEAD^^^
 109
 110check_describe B-0-* --long HEAD^^2^
 111check_describe A-3-* --long HEAD^^2
 112
 113check_describe c-7-* --tags
 114check_describe e-3-* --first-parent --tags
 115
 116test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
 117        echo "A^0" >expect &&
 118        git checkout A &&
 119        test_when_finished "git checkout -" &&
 120        git describe --contains >actual &&
 121        test_cmp expect actual
 122'
 123
 124: >err.expect
 125check_describe A --all A^0
 126test_expect_success 'no warning was displayed for A' '
 127        test_cmp err.expect err.actual
 128'
 129
 130test_expect_success 'rename tag A to Q locally' '
 131        mv .git/refs/tags/A .git/refs/tags/Q
 132'
 133cat - >err.expect <<EOF
 134warning: tag 'A' is really 'Q' here
 135EOF
 136check_describe A-* HEAD
 137test_expect_success 'warning was displayed for Q' '
 138        test_i18ncmp err.expect err.actual
 139'
 140test_expect_success 'rename tag Q back to A' '
 141        mv .git/refs/tags/Q .git/refs/tags/A
 142'
 143
 144test_expect_success 'pack tag refs' 'git pack-refs'
 145check_describe A-* HEAD
 146
 147check_describe "A-*[0-9a-f]" --dirty
 148
 149test_expect_success 'set-up dirty work tree' '
 150        echo >>file
 151'
 152
 153check_describe "A-*[0-9a-f]-dirty" --dirty
 154
 155check_describe "A-*[0-9a-f].mod" --dirty=.mod
 156
 157test_expect_success 'describe --dirty HEAD' '
 158        test_must_fail git describe --dirty HEAD
 159'
 160
 161test_expect_success 'set-up matching pattern tests' '
 162        git tag -a -m test-annotated test-annotated &&
 163        echo >>file &&
 164        test_tick &&
 165        git commit -a -m "one more" &&
 166        git tag test1-lightweight &&
 167        echo >>file &&
 168        test_tick &&
 169        git commit -a -m "yet another" &&
 170        git tag test2-lightweight &&
 171        echo >>file &&
 172        test_tick &&
 173        git commit -a -m "even more"
 174
 175'
 176
 177check_describe "test-annotated-*" --match="test-*"
 178
 179check_describe "test1-lightweight-*" --tags --match="test1-*"
 180
 181check_describe "test2-lightweight-*" --tags --match="test2-*"
 182
 183check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
 184
 185test_expect_success 'name-rev with exact tags' '
 186        echo A >expect &&
 187        tag_object=$(git rev-parse refs/tags/A) &&
 188        git name-rev --tags --name-only $tag_object >actual &&
 189        test_cmp expect actual &&
 190
 191        echo "A^0" >expect &&
 192        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 193        git name-rev --tags --name-only $tagged_commit >actual &&
 194        test_cmp expect actual
 195'
 196
 197test_expect_success 'describe --contains with the exact tags' '
 198        echo "A^0" >expect &&
 199        tag_object=$(git rev-parse refs/tags/A) &&
 200        git describe --contains $tag_object >actual &&
 201        test_cmp expect actual &&
 202
 203        echo "A^0" >expect &&
 204        tagged_commit=$(git rev-parse "refs/tags/A^0") &&
 205        git describe --contains $tagged_commit >actual &&
 206        test_cmp expect actual
 207'
 208
 209test_done