Merge branch 'jc/conflict-marker-size' into maint
[tgit.git] / t / t6120-describe.sh
blob065deadc29eb3838f391ce758c4b188249dc87f9
1 #!/bin/sh
3 test_description='test describe
6 .--------------o----o----o----x
7 / / /
8 o----o----o----o----o----. /
9 \ A c /
10 .------------o---o---o
11 D e
13 . ./test-lib.sh
15 check_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
31 test_expect_success setup '
33 test_tick &&
34 echo one >file && git add file && git commit -m initial &&
35 one=$(git rev-parse HEAD) &&
37 git describe --always HEAD &&
39 test_tick &&
40 echo two >file && git add file && git commit -m second &&
41 two=$(git rev-parse HEAD) &&
43 test_tick &&
44 echo three >file && git add file && git commit -m third &&
46 test_tick &&
47 echo A >file && git add file && git commit -m A &&
48 test_tick &&
49 git tag -a -m A A &&
51 test_tick &&
52 echo c >file && git add file && git commit -m c &&
53 test_tick &&
54 git tag c &&
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 &&
62 test_tick &&
63 git merge -m Merged c &&
64 merged=$(git rev-parse HEAD) &&
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 &&
72 test_tick &&
73 echo DD >another && git commit -a -m another &&
75 test_tick &&
76 git tag e &&
78 test_tick &&
79 echo DDD >another && git commit -a -m "yet another" &&
81 test_tick &&
82 git merge -m Merged $merged &&
84 test_tick &&
85 echo X >file && echo X >side && git add file side &&
86 git commit -m x
90 check_describe A-* HEAD
91 check_describe A-* HEAD^
92 check_describe D-* HEAD^^
93 check_describe A-* HEAD^^2
94 check_describe B HEAD^^2^
95 check_describe D-* HEAD^^^
97 check_describe c-* --tags HEAD
98 check_describe c-* --tags HEAD^
99 check_describe e-* --tags HEAD^^
100 check_describe c-* --tags HEAD^^2
101 check_describe B --tags HEAD^^2^
102 check_describe e --tags HEAD^^^
104 check_describe heads/master --all HEAD
105 check_describe tags/c-* --all HEAD^
106 check_describe tags/e --all HEAD^^^
108 check_describe B-0-* --long HEAD^^2^
109 check_describe A-3-* --long HEAD^^2
111 : >err.expect
112 check_describe A --all A^0
113 test_expect_success 'no warning was displayed for A' '
114 test_cmp err.expect err.actual
117 test_expect_success 'rename tag A to Q locally' '
118 mv .git/refs/tags/A .git/refs/tags/Q
120 cat - >err.expect <<EOF
121 warning: tag 'A' is really 'Q' here
123 check_describe A-* HEAD
124 test_expect_success 'warning was displayed for Q' '
125 test_cmp err.expect err.actual
127 test_expect_success 'rename tag Q back to A' '
128 mv .git/refs/tags/Q .git/refs/tags/A
131 test_expect_success 'pack tag refs' 'git pack-refs'
132 check_describe A-* HEAD
134 check_describe "A-*[0-9a-f]" --dirty
136 test_expect_success 'set-up dirty work tree' '
137 echo >>file
140 check_describe "A-*[0-9a-f]-dirty" --dirty
142 check_describe "A-*[0-9a-f].mod" --dirty=.mod
144 test_expect_success 'describe --dirty HEAD' '
145 test_must_fail git describe --dirty HEAD
148 test_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"
164 check_describe "test-annotated-*" --match="test-*"
166 check_describe "test1-lightweight-*" --tags --match="test1-*"
168 check_describe "test2-lightweight-*" --tags --match="test2-*"
170 check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
172 test_done