t / t6120-describe.shon commit Merge branch 'bg/format-patch-doc-update' (1a02a85)
   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   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
  72        test_tick &&
  73        echo DD >another && git commit -a -m another &&
  74
  75        test_tick &&
  76        git tag e &&
  77
  78        test_tick &&
  79        echo DDD >another && git commit -a -m "yet another" &&
  80
  81        test_tick &&
  82        git merge -m Merged $merged &&
  83
  84        test_tick &&
  85        echo X >file && echo X >side && git add file side &&
  86        git commit -m x
  87
  88'
  89
  90check_describe A-* HEAD
  91check_describe A-* HEAD^
  92check_describe D-* HEAD^^
  93check_describe A-* HEAD^^2
  94check_describe B HEAD^^2^
  95check_describe D-* HEAD^^^
  96
  97check_describe c-* --tags HEAD
  98check_describe c-* --tags HEAD^
  99check_describe e-* --tags HEAD^^
 100check_describe c-* --tags HEAD^^2
 101check_describe B --tags HEAD^^2^
 102check_describe e --tags HEAD^^^
 103
 104check_describe heads/master --all HEAD
 105check_describe tags/c-* --all HEAD^
 106check_describe tags/e --all HEAD^^^
 107
 108check_describe B-0-* --long HEAD^^2^
 109check_describe A-3-* --long HEAD^^2
 110
 111: >err.expect
 112check_describe A --all A^0
 113test_expect_success 'no warning was displayed for A' '
 114        test_cmp err.expect err.actual
 115'
 116
 117test_expect_success 'rename tag A to Q locally' '
 118        mv .git/refs/tags/A .git/refs/tags/Q
 119'
 120cat - >err.expect <<EOF
 121warning: tag 'A' is really 'Q' here
 122EOF
 123check_describe A-* HEAD
 124test_expect_success 'warning was displayed for Q' '
 125        test_cmp err.expect err.actual
 126'
 127test_expect_success 'rename tag Q back to A' '
 128        mv .git/refs/tags/Q .git/refs/tags/A
 129'
 130
 131test_expect_success 'pack tag refs' 'git pack-refs'
 132check_describe A-* HEAD
 133
 134check_describe "A-*[0-9a-f]" --dirty
 135
 136test_expect_success 'set-up dirty work tree' '
 137        echo >>file
 138'
 139
 140check_describe "A-*[0-9a-f]-dirty" --dirty
 141
 142check_describe "A-*[0-9a-f].mod" --dirty=.mod
 143
 144test_expect_success 'describe --dirty HEAD' '
 145        test_must_fail git describe --dirty HEAD
 146'
 147
 148test_expect_success 'set-up matching pattern tests' '
 149        git tag -a -m test-annotated test-annotated &&
 150        echo >>file &&
 151        test_tick &&
 152        git commit -a -m "one more" &&
 153        git tag test1-lightweight &&
 154        echo >>file &&
 155        test_tick &&
 156        git commit -a -m "yet another" &&
 157        git tag test2-lightweight &&
 158        echo >>file &&
 159        test_tick &&
 160        git commit -a -m "even more"
 161
 162'
 163
 164check_describe "test-annotated-*" --match="test-*"
 165
 166check_describe "test1-lightweight-*" --tags --match="test1-*"
 167
 168check_describe "test2-lightweight-*" --tags --match="test2-*"
 169
 170check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
 171
 172test_done