Skip to content

Commit e39ceeb

Browse files
hanwengitster
authored andcommitted
t1430: remove refs using test-tool
Signed-off-by: Han-Wen Nienhuys <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3c966c7 commit e39ceeb

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

t/t1430-bad-ref-name.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
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 &&
156156
printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
157-
test_when_finished "rm -f .git/refs/tags/shadow" &&
157+
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 &&
160160
test_cmp expect actual &&
@@ -165,9 +165,9 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
165165
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
166166
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
167167
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
168-
test_when_finished "rm -f .git/refs/heads/badname" &&
168+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
169169
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
170-
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
170+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
171171
git for-each-ref >output 2>error &&
172172
! grep -e "broken\.\.\.ref" output &&
173173
! grep -e "badname" output &&
@@ -204,7 +204,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref to broken name'
204204
205205
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
206206
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
207-
test_when_finished "rm -f .git/refs/heads/badname" &&
207+
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 &&
210210
test_must_be_empty output &&
@@ -216,7 +216,7 @@ test_expect_success 'branch -d can delete symref to broken name' '
216216
217217
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
218218
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
219-
test_when_finished "rm -f .git/refs/heads/badname" &&
219+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
220220
git branch -d badname >output 2>error &&
221221
test_path_is_missing .git/refs/heads/badname &&
222222
test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@@ -225,7 +225,7 @@ test_expect_success 'branch -d can delete symref to broken name' '
225225

226226
test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
227227
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
228-
test_when_finished "rm -f .git/refs/heads/badname" &&
228+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
229229
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
230230
test_path_is_missing .git/refs/heads/badname &&
231231
test_must_be_empty output &&
@@ -234,7 +234,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref to brok
234234

235235
test_expect_success 'branch -d can delete dangling symref to broken name' '
236236
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
237-
test_when_finished "rm -f .git/refs/heads/badname" &&
237+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
238238
git branch -d badname >output 2>error &&
239239
test_path_is_missing .git/refs/heads/badname &&
240240
test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@@ -246,7 +246,7 @@ test_expect_success 'update-ref -d can delete broken name through symref' '
246246
247247
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
248248
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
249-
test_when_finished "rm -f .git/refs/heads/badname" &&
249+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
250250
git update-ref -d refs/heads/badname >output 2>error &&
251251
test_path_is_missing .git/refs/heads/broken...ref &&
252252
test_must_be_empty output &&
@@ -255,7 +255,7 @@ test_expect_success 'update-ref -d can delete broken name through symref' '
255255

256256
test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
257257
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
258-
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
258+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
259259
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
260260
test_path_is_missing .git/refs/heads/broken...symref &&
261261
test_must_be_empty output &&
@@ -264,7 +264,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref with broken name
264264

265265
test_expect_success 'branch -d can delete symref with broken name' '
266266
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
267-
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
267+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
268268
git branch -d broken...symref >output 2>error &&
269269
test_path_is_missing .git/refs/heads/broken...symref &&
270270
test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
@@ -273,7 +273,7 @@ test_expect_success 'branch -d can delete symref with broken name' '
273273

274274
test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
275275
printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
276-
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
276+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
277277
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
278278
test_path_is_missing .git/refs/heads/broken...symref &&
279279
test_must_be_empty output &&
@@ -282,7 +282,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref with br
282282

283283
test_expect_success 'branch -d can delete dangling symref with broken name' '
284284
printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
285-
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
285+
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
286286
git branch -d broken...symref >output 2>error &&
287287
test_path_is_missing .git/refs/heads/broken...symref &&
288288
test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&

0 commit comments

Comments
 (0)