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 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
87 git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
88 git rev-parse final^1^! >actual &&
89 test_cmp expect actual
92 test_expect_success 'large graft octopus' '
93 test_cmp_rev_output b31 "git rev-parse --verify b1^30"
96 test_expect_success 'repack for next test' '
100 test_expect_success 'short SHA-1 works' '
101 start=$(git rev-parse --verify start) &&
102 test_cmp_rev_output start "git rev-parse ${start%?}"
105 # rev^- tests; we can use a simpler setup for these
107 test_expect_success 'setup for rev^- tests' '
112 # Merge in a branch for testing rev^-
113 git checkout -b branch &&
114 git checkout HEAD^^ &&
115 git merge -m merge --no-edit --no-ff branch &&
116 git checkout -b merge
119 # The merged branch has 2 commits + the merge
120 test_expect_success 'rev-list --count merge^- = merge^..merge' '
121 git rev-list --count merge^..merge >expect &&
123 test_cmp expect actual
126 # All rev^- rev-parse tests
128 test_expect_success 'rev-parse merge^- = merge^..merge' '
129 git rev-parse merge^..merge >expect &&
130 git rev-parse merge^- >actual &&
131 test_cmp expect actual
134 test_expect_success 'rev-parse merge^-1 = merge^..merge' '
135 git rev-parse merge^1..merge >expect &&
136 git rev-parse merge^-1 >actual &&
137 test_cmp expect actual
140 test_expect_success 'rev-parse merge^-2 = merge^2..merge' '
141 git rev-parse merge^2..merge >expect &&
142 git rev-parse merge^-2 >actual &&
143 test_cmp expect actual
146 test_expect_success 'rev-parse merge^-0 (invalid parent)' '
147 test_must_fail git rev-parse merge^-0
150 test_expect_success 'rev-parse merge^-3 (invalid parent)' '
151 test_must_fail git rev-parse merge^-3
154 test_expect_success 'rev-parse merge^-^ (garbage after ^-)' '
155 test_must_fail git rev-parse merge^-^
158 test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' '
159 test_must_fail git rev-parse merge^-1x
162 # All rev^- rev-list tests (should be mostly the same as rev-parse; the reason
163 # for the duplication is that rev-parse and rev-list use different parsers).
165 test_expect_success 'rev-list merge^- = merge^..merge' '
166 git rev-list merge^..merge >expect &&
167 git rev-list merge^- >actual &&
168 test_cmp expect actual
171 test_expect_success 'rev-list merge^-1 = merge^1..merge' '
172 git rev-list merge^1..merge >expect &&
173 git rev-list merge^-1 >actual &&
174 test_cmp expect actual
177 test_expect_success 'rev-list merge^-2 = merge^2..merge' '
178 git rev-list merge^2..merge >expect &&
179 git rev-list merge^-2 >actual &&
180 test_cmp expect actual
183 test_expect_success 'rev-list merge^-0 (invalid parent)' '
184 test_must_fail git rev-list merge^-0
187 test_expect_success 'rev-list merge^-3 (invalid parent)' '
188 test_must_fail git rev-list merge^-3
191 test_expect_success 'rev-list merge^-^ (garbage after ^-)' '
192 test_must_fail git rev-list merge^-^
195 test_expect_success 'rev-list merge^-1x (garbage after ^-1)' '
196 test_must_fail git rev-list merge^-1x