]> git.ipfire.org Git - thirdparty/git.git/blame - t/t6101-rev-parse-parents.sh
Merge branch 'wb/fsmonitor-bitmap-fix'
[thirdparty/git.git] / t / t6101-rev-parse-parents.sh
CommitLineData
ef0bd2e6
JS
1#!/bin/sh
2#
3# Copyright (c) 2005 Johannes Schindelin
4#
5
5be60078 6test_description='Test git rev-parse with different parent options'
ef0bd2e6
JS
7
8. ./test-lib.sh
ef0bd2e6 9
c812be9d
JN
10test_cmp_rev_output () {
11 git rev-parse --verify "$1" >expect &&
12 eval "$2" >actual &&
13 test_cmp expect actual
14}
15
7495a173
FC
16test_expect_success 'setup' '
17 test_commit start &&
18 test_commit second &&
19 git checkout --orphan tmp &&
20 test_commit start2 &&
21 git checkout master &&
e379fdf3 22 git merge -m next --allow-unrelated-histories start2 &&
e228c173
JS
23 test_commit final &&
24
25 test_seq 40 |
26 while read i
27 do
28 git checkout --orphan "b$i" &&
29 test_tick &&
30 git commit --allow-empty -m "$i" &&
31 commit=$(git rev-parse --verify HEAD) &&
32 printf "$commit " >>.git/info/grafts
33 done
7495a173 34'
ef0bd2e6 35
dfb1dc5c
FC
36test_expect_success 'start is valid' '
37 git rev-parse start | grep "^[0-9a-f]\{40\}$"
38'
39
40test_expect_success 'start^0' '
c812be9d 41 test_cmp_rev_output tags/start "git rev-parse start^0"
dfb1dc5c
FC
42'
43
44test_expect_success 'start^1 not valid' '
d8f76813 45 test_must_fail git rev-parse --verify start^1
dfb1dc5c
FC
46'
47
48test_expect_success 'second^1 = second^' '
c812be9d 49 test_cmp_rev_output second^ "git rev-parse second^1"
dfb1dc5c
FC
50'
51
52test_expect_success 'final^1^1^1' '
c812be9d 53 test_cmp_rev_output start "git rev-parse final^1^1^1"
dfb1dc5c
FC
54'
55
56test_expect_success 'final^1^1^1 = final^^^' '
c812be9d 57 test_cmp_rev_output final^^^ "git rev-parse final^1^1^1"
dfb1dc5c
FC
58'
59
60test_expect_success 'final^1^2' '
c812be9d 61 test_cmp_rev_output start2 "git rev-parse final^1^2"
dfb1dc5c
FC
62'
63
64test_expect_success 'final^1^2 != final^1^1' '
65 test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
66'
67
68test_expect_success 'final^1^3 not valid' '
d8f76813 69 test_must_fail git rev-parse --verify final^1^3
dfb1dc5c
FC
70'
71
72test_expect_success '--verify start2^1' '
73 test_must_fail git rev-parse --verify start2^1
74'
75
76test_expect_success '--verify start2^0' '
77 git rev-parse --verify start2^0
78'
79
80test_expect_success 'final^1^@ = final^1^1 final^1^2' '
c812be9d
JN
81 git rev-parse final^1^1 final^1^2 >expect &&
82 git rev-parse final^1^@ >actual &&
83 test_cmp expect actual
dfb1dc5c
FC
84'
85
a2e7b04c
JK
86test_expect_success 'symbolic final^1^@ = final^1^1 final^1^2' '
87 git rev-parse --symbolic final^1^1 final^1^2 >expect &&
88 git rev-parse --symbolic final^1^@ >actual &&
89 test_cmp expect actual
90'
91
dfb1dc5c 92test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
c812be9d
JN
93 git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
94 git rev-parse final^1^! >actual &&
95 test_cmp expect actual
dfb1dc5c
FC
96'
97
a2e7b04c
JK
98test_expect_success 'symbolic final^1^! = final^1 ^final^1^1 ^final^1^2' '
99 git rev-parse --symbolic final^1 ^final^1^1 ^final^1^2 >expect &&
100 git rev-parse --symbolic final^1^! >actual &&
101 test_cmp expect actual
102'
103
e228c173
JS
104test_expect_success 'large graft octopus' '
105 test_cmp_rev_output b31 "git rev-parse --verify b1^30"
106'
107
dfb1dc5c
FC
108test_expect_success 'repack for next test' '
109 git repack -a -d
110'
111
7ff895c0 112test_expect_success 'short SHA-1 works' '
c812be9d
JN
113 start=$(git rev-parse --verify start) &&
114 test_cmp_rev_output start "git rev-parse ${start%?}"
dfb1dc5c 115'
7ff895c0 116
8779351d
VN
117# rev^- tests; we can use a simpler setup for these
118
119test_expect_success 'setup for rev^- tests' '
120 test_commit one &&
121 test_commit two &&
122 test_commit three &&
123
124 # Merge in a branch for testing rev^-
125 git checkout -b branch &&
126 git checkout HEAD^^ &&
127 git merge -m merge --no-edit --no-ff branch &&
128 git checkout -b merge
129'
130
131# The merged branch has 2 commits + the merge
132test_expect_success 'rev-list --count merge^- = merge^..merge' '
133 git rev-list --count merge^..merge >expect &&
134 echo 3 >actual &&
135 test_cmp expect actual
136'
137
138# All rev^- rev-parse tests
139
140test_expect_success 'rev-parse merge^- = merge^..merge' '
141 git rev-parse merge^..merge >expect &&
142 git rev-parse merge^- >actual &&
143 test_cmp expect actual
144'
145
146test_expect_success 'rev-parse merge^-1 = merge^..merge' '
147 git rev-parse merge^1..merge >expect &&
148 git rev-parse merge^-1 >actual &&
149 test_cmp expect actual
150'
151
152test_expect_success 'rev-parse merge^-2 = merge^2..merge' '
153 git rev-parse merge^2..merge >expect &&
154 git rev-parse merge^-2 >actual &&
155 test_cmp expect actual
156'
157
a2e7b04c
JK
158test_expect_success 'symbolic merge^-1 = merge^1..merge' '
159 git rev-parse --symbolic merge^1..merge >expect &&
160 git rev-parse --symbolic merge^-1 >actual &&
161 test_cmp expect actual
162'
163
8779351d
VN
164test_expect_success 'rev-parse merge^-0 (invalid parent)' '
165 test_must_fail git rev-parse merge^-0
166'
167
168test_expect_success 'rev-parse merge^-3 (invalid parent)' '
169 test_must_fail git rev-parse merge^-3
170'
171
172test_expect_success 'rev-parse merge^-^ (garbage after ^-)' '
173 test_must_fail git rev-parse merge^-^
174'
175
176test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' '
177 test_must_fail git rev-parse merge^-1x
178'
179
180# All rev^- rev-list tests (should be mostly the same as rev-parse; the reason
181# for the duplication is that rev-parse and rev-list use different parsers).
182
183test_expect_success 'rev-list merge^- = merge^..merge' '
184 git rev-list merge^..merge >expect &&
185 git rev-list merge^- >actual &&
186 test_cmp expect actual
187'
188
189test_expect_success 'rev-list merge^-1 = merge^1..merge' '
190 git rev-list merge^1..merge >expect &&
191 git rev-list merge^-1 >actual &&
192 test_cmp expect actual
193'
194
195test_expect_success 'rev-list merge^-2 = merge^2..merge' '
196 git rev-list merge^2..merge >expect &&
197 git rev-list merge^-2 >actual &&
198 test_cmp expect actual
199'
200
201test_expect_success 'rev-list merge^-0 (invalid parent)' '
202 test_must_fail git rev-list merge^-0
203'
204
205test_expect_success 'rev-list merge^-3 (invalid parent)' '
206 test_must_fail git rev-list merge^-3
207'
208
209test_expect_success 'rev-list merge^-^ (garbage after ^-)' '
210 test_must_fail git rev-list merge^-^
211'
212
213test_expect_success 'rev-list merge^-1x (garbage after ^-1)' '
214 test_must_fail git rev-list merge^-1x
215'
216
0ed556d3
EN
217test_expect_success 'rev-parse $garbage^@ does not segfault' '
218 test_must_fail git rev-parse $EMPTY_TREE^@
219'
220
221test_expect_success 'rev-parse $garbage...$garbage does not segfault' '
222 test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB
223'
224
ef0bd2e6 225test_done