Merge branch 'da/mergetool-winmerge'
[alt-git.git] / t / t6120-describe.sh
blobc0e5b2a6275df2d92172327b2d629cc73720423e
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,R 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 &&
71 test_tick &&
72 git tag -a -m R R &&
74 test_tick &&
75 echo DD >another && git commit -a -m another &&
77 test_tick &&
78 git tag e &&
80 test_tick &&
81 echo DDD >another && git commit -a -m "yet another" &&
83 test_tick &&
84 git merge -m Merged $merged &&
86 test_tick &&
87 echo X >file && echo X >side && git add file side &&
88 git commit -m x
92 check_describe A-* HEAD
93 check_describe A-* HEAD^
94 check_describe R-* HEAD^^
95 check_describe A-* HEAD^^2
96 check_describe B HEAD^^2^
97 check_describe R-* HEAD^^^
99 check_describe c-* --tags HEAD
100 check_describe c-* --tags HEAD^
101 check_describe e-* --tags HEAD^^
102 check_describe c-* --tags HEAD^^2
103 check_describe B --tags HEAD^^2^
104 check_describe e --tags HEAD^^^
106 check_describe heads/master --all HEAD
107 check_describe tags/c-* --all HEAD^
108 check_describe tags/e --all HEAD^^^
110 check_describe B-0-* --long HEAD^^2^
111 check_describe A-3-* --long HEAD^^2
113 check_describe c-7-* --tags
114 check_describe e-3-* --first-parent --tags
116 : >err.expect
117 check_describe A --all A^0
118 test_expect_success 'no warning was displayed for A' '
119 test_cmp err.expect err.actual
122 test_expect_success 'rename tag A to Q locally' '
123 mv .git/refs/tags/A .git/refs/tags/Q
125 cat - >err.expect <<EOF
126 warning: tag 'A' is really 'Q' here
128 check_describe A-* HEAD
129 test_expect_success 'warning was displayed for Q' '
130 test_i18ncmp err.expect err.actual
132 test_expect_success 'rename tag Q back to A' '
133 mv .git/refs/tags/Q .git/refs/tags/A
136 test_expect_success 'pack tag refs' 'git pack-refs'
137 check_describe A-* HEAD
139 check_describe "A-*[0-9a-f]" --dirty
141 test_expect_success 'set-up dirty work tree' '
142 echo >>file
145 check_describe "A-*[0-9a-f]-dirty" --dirty
147 check_describe "A-*[0-9a-f].mod" --dirty=.mod
149 test_expect_success 'describe --dirty HEAD' '
150 test_must_fail git describe --dirty HEAD
153 test_expect_success 'set-up matching pattern tests' '
154 git tag -a -m test-annotated test-annotated &&
155 echo >>file &&
156 test_tick &&
157 git commit -a -m "one more" &&
158 git tag test1-lightweight &&
159 echo >>file &&
160 test_tick &&
161 git commit -a -m "yet another" &&
162 git tag test2-lightweight &&
163 echo >>file &&
164 test_tick &&
165 git commit -a -m "even more"
169 check_describe "test-annotated-*" --match="test-*"
171 check_describe "test1-lightweight-*" --tags --match="test1-*"
173 check_describe "test2-lightweight-*" --tags --match="test2-*"
175 check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
177 test_expect_success 'name-rev with exact tags' '
178 echo A >expect &&
179 tag_object=$(git rev-parse refs/tags/A) &&
180 git name-rev --tags --name-only $tag_object >actual &&
181 test_cmp expect actual &&
183 echo "A^0" >expect &&
184 tagged_commit=$(git rev-parse "refs/tags/A^0") &&
185 git name-rev --tags --name-only $tagged_commit >actual &&
186 test_cmp expect actual
189 test_expect_success 'describe --contains with the exact tags' '
190 echo "A^0" >expect &&
191 tag_object=$(git rev-parse refs/tags/A) &&
192 git describe --contains $tag_object >actual &&
193 test_cmp expect actual &&
195 echo "A^0" >expect &&
196 tagged_commit=$(git rev-parse "refs/tags/A^0") &&
197 git describe --contains $tagged_commit >actual &&
198 test_cmp expect actual
201 test_done