Skip to content

Commit 9912391

Browse files
hanwengitster
authored andcommitted
t1430: create valid symrefs using test-helper
This still leaves some other direct filesystem access. Currently, the files backend does not allow invalidly named symrefs. Fixes for this are currently in the 'seen' branch Signed-off-by: Han-Wen Nienhuys <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e39ceeb commit 9912391

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

t/t1430-bad-ref-name.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
153153
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
154154
git branch shadow one &&
155155
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
156-
printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
156+
test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
157157
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
158158
git rev-parse --verify one >expect &&
159159
git rev-parse --verify shadow >actual 2>err &&
@@ -203,7 +203,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref to broken name'
203203
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
204204
205205
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
206-
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
206+
test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
207207
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
208208
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
209209
test_path_is_missing .git/refs/heads/badname &&
@@ -213,9 +213,8 @@ test_expect_success 'update-ref --no-deref -d can delete symref to broken name'
213213

214214
test_expect_success 'branch -d can delete symref to broken name' '
215215
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
216-
217216
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
218-
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
217+
test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
219218
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
220219
git branch -d badname >output 2>error &&
221220
test_path_is_missing .git/refs/heads/badname &&
@@ -224,7 +223,7 @@ test_expect_success 'branch -d can delete symref to broken name' '
224223
'
225224

226225
test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
227-
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
226+
test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
228227
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
229228
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
230229
test_path_is_missing .git/refs/heads/badname &&
@@ -233,7 +232,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref to brok
233232
'
234233

235234
test_expect_success 'branch -d can delete dangling symref to broken name' '
236-
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
235+
test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
237236
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
238237
git branch -d badname >output 2>error &&
239238
test_path_is_missing .git/refs/heads/badname &&
@@ -243,9 +242,8 @@ test_expect_success 'branch -d can delete dangling symref to broken name' '
243242

244243
test_expect_success 'update-ref -d can delete broken name through symref' '
245244
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
246-
247245
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
248-
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
246+
test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
249247
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
250248
git update-ref -d refs/heads/badname >output 2>error &&
251249
test_path_is_missing .git/refs/heads/broken...ref &&

0 commit comments

Comments
 (0)