3 # Copyright (c) 2005 Johannes Schindelin
6 test_description='Test git rev-parse with different parent options'
10 test_cmp_rev_output () {
11 git rev-parse --verify "$1" >expect &&
13 test_cmp expect actual
16 test_expect_success 'setup' '
19 git checkout --orphan tmp &&
21 git checkout master &&
22 git merge -m next --allow-unrelated-histories start2 &&
28 git checkout --orphan "b$i" &&
30 git commit --allow-empty -m "$i" &&
31 commit=$(git rev-parse --verify HEAD) &&
32 printf "$commit " >>.git/info/grafts
36 test_expect_success 'start is valid' '
37 git rev-parse start | grep "^[0-9a-f]\{40\}$"
40 test_expect_success 'start^0' '
41 test_cmp_rev_output tags/start "git rev-parse start^0"
44 test_expect_success 'start^1 not valid' '
45 test_must_fail git rev-parse --verify start^1
48 test_expect_success 'second^1 = second^' '
49 test_cmp_rev_output second^ "git rev-parse second^1"
52 test_expect_success 'final^1^1^1' '
53 test_cmp_rev_output start "git rev-parse final^1^1^1"
56 test_expect_success 'final^1^1^1 = final^^^' '
57 test_cmp_rev_output final^^^ "git rev-parse final^1^1^1"
60 test_expect_success 'final^1^2' '
61 test_cmp_rev_output start2 "git rev-parse final^1^2"
64 test_expect_success 'final^1^2 != final^1^1' '
65 test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
68 test_expect_success 'final^1^3 not valid' '
69 test_must_fail git rev-parse --verify final^1^3
72 test_expect_success '--verify start2^1' '
73 test_must_fail git rev-parse --verify start2^1
76 test_expect_success '--verify start2^0' '
77 git rev-parse --verify start2^0
80 test_expect_success 'final^1^@ = final^1^1 final^1^2' '
81 git rev-parse final^1^1 final^1^2 >expect &&
82 git rev-parse final^1^@ >actual &&
83 test_cmp expect actual
86 test_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
92 test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
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
98 test_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
104 test_expect_success 'large graft octopus' '
105 test_cmp_rev_output b31 "git rev-parse --verify b1^30"
108 test_expect_success 'repack for next test' '
112 test_expect_success 'short SHA-1 works' '
113 start=$(git rev-parse --verify start) &&
114 test_cmp_rev_output start "git rev-parse ${start%?}"
117 # rev^- tests; we can use a simpler setup for these
119 test_expect_success 'setup for rev^- tests' '
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
131 # The merged branch has 2 commits + the merge
132 test_expect_success 'rev-list --count merge^- = merge^..merge' '
133 git rev-list --count merge^..merge >expect &&
135 test_cmp expect actual
138 # All rev^- rev-parse tests
140 test_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
146 test_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
152 test_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
158 test_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
164 test_expect_success 'rev-parse merge^-0 (invalid parent)' '
165 test_must_fail git rev-parse merge^-0
168 test_expect_success 'rev-parse merge^-3 (invalid parent)' '
169 test_must_fail git rev-parse merge^-3
172 test_expect_success 'rev-parse merge^-^ (garbage after ^-)' '
173 test_must_fail git rev-parse merge^-^
176 test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' '
177 test_must_fail git rev-parse merge^-1x
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).
183 test_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
189 test_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
195 test_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
201 test_expect_success 'rev-list merge^-0 (invalid parent)' '
202 test_must_fail git rev-list merge^-0
205 test_expect_success 'rev-list merge^-3 (invalid parent)' '
206 test_must_fail git rev-list merge^-3
209 test_expect_success 'rev-list merge^-^ (garbage after ^-)' '
210 test_must_fail git rev-list merge^-^
213 test_expect_success 'rev-list merge^-1x (garbage after ^-1)' '
214 test_must_fail git rev-list merge^-1x
217 test_expect_success 'rev-parse $garbage^@ does not segfault' '
218 test_must_fail git rev-parse $EMPTY_TREE^@
221 test_expect_success 'rev-parse $garbage...$garbage does not segfault' '
222 test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB