@@ -154,7 +154,7 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
154
154
git branch shadow one &&
155
155
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
156
156
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" &&
158
158
git rev-parse --verify one >expect &&
159
159
git rev-parse --verify shadow >actual 2>err &&
160
160
test_cmp expect actual &&
@@ -165,9 +165,9 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
165
165
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
166
166
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
167
167
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" &&
169
169
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" &&
171
171
git for-each-ref >output 2>error &&
172
172
! grep -e "broken\.\.\.ref" output &&
173
173
! grep -e "badname" output &&
@@ -204,7 +204,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref to broken name'
204
204
205
205
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
206
206
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" &&
208
208
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
209
209
test_path_is_missing .git/refs/heads/badname &&
210
210
test_must_be_empty output &&
@@ -216,7 +216,7 @@ test_expect_success 'branch -d can delete symref to broken name' '
216
216
217
217
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
218
218
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" &&
220
220
git branch -d badname >output 2>error &&
221
221
test_path_is_missing .git/refs/heads/badname &&
222
222
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' '
225
225
226
226
test_expect_success ' update-ref --no-deref -d can delete dangling symref to broken name' '
227
227
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" &&
229
229
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
230
230
test_path_is_missing .git/refs/heads/badname &&
231
231
test_must_be_empty output &&
@@ -234,7 +234,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref to brok
234
234
235
235
test_expect_success ' branch -d can delete dangling symref to broken name' '
236
236
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" &&
238
238
git branch -d badname >output 2>error &&
239
239
test_path_is_missing .git/refs/heads/badname &&
240
240
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' '
246
246
247
247
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
248
248
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" &&
250
250
git update-ref -d refs/heads/badname >output 2>error &&
251
251
test_path_is_missing .git/refs/heads/broken...ref &&
252
252
test_must_be_empty output &&
@@ -255,7 +255,7 @@ test_expect_success 'update-ref -d can delete broken name through symref' '
255
255
256
256
test_expect_success ' update-ref --no-deref -d can delete symref with broken name' '
257
257
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" &&
259
259
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
260
260
test_path_is_missing .git/refs/heads/broken...symref &&
261
261
test_must_be_empty output &&
@@ -264,7 +264,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref with broken name
264
264
265
265
test_expect_success ' branch -d can delete symref with broken name' '
266
266
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" &&
268
268
git branch -d broken...symref >output 2>error &&
269
269
test_path_is_missing .git/refs/heads/broken...symref &&
270
270
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' '
273
273
274
274
test_expect_success ' update-ref --no-deref -d can delete dangling symref with broken name' '
275
275
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" &&
277
277
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
278
278
test_path_is_missing .git/refs/heads/broken...symref &&
279
279
test_must_be_empty output &&
@@ -282,7 +282,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref with br
282
282
283
283
test_expect_success ' branch -d can delete dangling symref with broken name' '
284
284
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" &&
286
286
git branch -d broken...symref >output 2>error &&
287
287
test_path_is_missing .git/refs/heads/broken...symref &&
288
288
test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
0 commit comments